glib-web 4.17.0 → 4.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef11a5ce52461fa118abf8e4fbc32331d993b5377b0848d581d90839a8b593f9
-  data.tar.gz: 31526b9747c9db566b289279638d861c4a75c4ae918ad41d6cce14cf4ee49350
+  metadata.gz: 82f79da54bb6dc84ffc68665e5b67b17a333a7f30d080d38daa10149dfa5e151
+  data.tar.gz: 4285bb6b341dd126a71b5a78d7e15b62101878bbb4c3652c769369f62dddd5b9
 SHA512:
-  metadata.gz: db769bbb2e4b7beabd4bc5f753e92eb962c4608eca2cd0646796b0e243e4fd2c15078af6d53e30f95a4179251a6b4f2a8cc58e4164584037863a448310d27833
-  data.tar.gz: 8e70533b7e2e64677284ccc85d635c147d01e796c502b89fb4dbf944258c53d07b9431a2597c07acb38f468eef8cd2b478c6fd8eb5e2ccc536cb8838fc81661d
+  metadata.gz: 248c2b369209b8162ed63d9235cb2251bb3075d18fa87581844b55af0f0a117256b863af78e7734a0b1c3fb7f3c21ebd7eebfd09fb758efc05c7b608934638f4
+  data.tar.gz: 6353a2fde95a69aa82ff4039b998f84d260a8bc9a8bb7ad321d8335da33c9fe5e7297d9b23b100d1c9f29dd8c5be3758956e162bab6c2432b45ba95dc0367cfb

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

@@ -436,6 +436,7 @@ class Glib::JsonUi::ViewBuilder
       date :max
       string :type
       bool :clearable
+      bool :buttonTemplate
 
       # Override
       def value(value)
@@ -449,6 +450,7 @@ class Glib::JsonUi::ViewBuilder
       date_time :min
       date_time :max
       bool :clearable
+      bool :buttonTemplate
     end
 
     class Location < AbstractField

data/app/views/json_ui/garage/actions/_dialogs.json.jbuilder

@@ -44,6 +44,10 @@ section.rows builder: ->(template) do
     render 'json_ui/garage/actions/dialogs_show', json: json, action: action, dialog_mode: :show
   end
 
+  template.thumbnail title: 'dialogs/show (with form)', onClick: ->(action) do
+    render 'json_ui/garage/actions/dialogs_show', json: json, action: action, dialog_mode: :show, include_form: true
+  end
+
   template.thumbnail title: 'dialogs/open', onClick: ->(action) do
     action.dialogs_open width: 950, url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog'), disableCloseButton: true
   end

data/app/views/json_ui/garage/actions/_dialogs_show.json.jbuilder

@@ -10,22 +10,36 @@ if (update_existing = local_assigns[:update_existing])
   options[:updateExisting] = update_existing
 end
 
+include_form = local_assigns[:include_form]
+
 action.send "dialogs_#{dialog_mode}", **options, content: ->(dialog) do
   dialog.body padding: glib_json_padding_body, childViews: ->(body) do
     body.markdown text: markdown
 
-    body.panels_split width: 'matchParent', content: ->(split) do
-      split.left childViews: ->(left) do
-        left.panels_horizontal height: 'matchParent', align: 'middle', childViews: ->(horizontal) do
-          horizontal.label text: 'Open current', onClick: ->(subaction) do
-            subaction.dialogs_open width: 900, fullscreen: 'mobile', url: json_ui_garage_url(path: 'forms/basic')
+    if include_form
+      render \
+        'json_ui/garage/forms/basic_content',
+        json: json,
+        panel: body,
+        mode: 'dialog',
+        disable_dirty_check: true
+    else
+      body.panels_split width: 'matchParent', content: ->(split) do
+        split.left childViews: ->(left) do
+          left.panels_horizontal height: 'matchParent', align: 'middle', childViews: ->(horizontal) do
+            horizontal.label text: 'Open current', onClick: ->(subaction) do
+              subaction.dialogs_open \
+                width: 900,
+                fullscreen: 'mobile',
+                url: json_ui_garage_url(path: 'forms/basic')
+            end
           end
         end
-      end
 
-      split.right childViews: ->(right) do
-        right.button text: 'Open New', onClick: ->(subaction) do
-          subaction.dialogs_open url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog')
+        split.right childViews: ->(right) do
+          right.button text: 'Open New', onClick: ->(subaction) do
+            subaction.dialogs_open url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog')
+          end
         end
       end
     end

data/app/views/json_ui/garage/actions/_sheets.json.jbuilder

@@ -6,7 +6,7 @@ end
 section.rows builder: ->(template) do
   template.thumbnail title: 'sheets/select', onClick: ->(action) do
     action.sheets_select message: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed rutrum vel nisi in pharetra. Aenean mollis feugiat elementum. Donec tempor arcu fringilla risus finibus cursus. Donec eleifend ex sit amet odio rutrum, vitae ornare nunc congue. In hac habitasse platea dictumst. Curabitur at velit et odio ornare vestibulum sit amet vitae ex. Proin tincidunt rutrum libero vitae tempus.', buttons: ->(menu) do
-      menu.button text: 'Option1', onClick: ->(subaction) do
+      menu.button text: 'Option1 Aenean mollis feugiat elementum. Donec tempor arcu fringilla risus finibus cursus.', onClick: ->(subaction) do
         subaction.dialogs_alert message: 'Option 1'
       end
       menu.button text: 'Option2', onClick: ->(subaction) do

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

@@ -0,0 +1,47 @@
+disable_dirty_check = local_assigns[:disable_dirty_check]
+
+panel.panels_form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', padding: glib_json_padding_body, childViews: ->(form) do
+  form.fields_text name: 'user[name]', width: 'matchParent', label: 'Name', disableDirtyCheck: disable_dirty_check
+  form.fields_password name: 'user[password]', width: 'matchParent', label: 'Password', disableDirtyCheck: disable_dirty_check
+  form.fields_text name: 'user[title]', width: 'matchParent', label: 'Title', disableDirtyCheck: disable_dirty_check
+
+  form.fields_select width: 'matchParent', name: 'user[types]', options: [
+    { value: 1, text: 'One' },
+    { value: 2, text: 'Two' }
+  ], disableDirtyCheck: disable_dirty_check
+
+  form.fields_checkGroup disableDirtyCheck: disable_dirty_check, width: 'matchParent', name: 'user[multichoices]', childViews: ->(group) do
+    group.fields_check label: 'Choice 1', checkValue: 'choice1'
+    group.fields_check label: 'Choice 2', checkValue: 'choice2'
+  end
+
+  form.panels_split width: 'matchParent', content: ->(split) do
+    split.left childViews: ->(left) do
+      left.panels_horizontal height: 'matchParent', align: 'middle', childViews: ->(horizontal) do
+        mode = local_assigns[:mode]
+        case mode || params[:mode]
+        when 'dialog'
+          horizontal.fields_hidden name: 'mode', value: 'dialog'
+          horizontal.button styleClass: 'link', text: 'cancel', onClick: ->(action) { action.dialogs_close }
+        when 'dialog_reload'
+          horizontal.button styleClass: 'link', text: 'back', onClick: ->(action) do
+            render 'json_ui/garage/actions/dialogs_show', json: json, action: action, dialog_mode: :reload
+          end
+        when 'dialog_show'
+          horizontal.button styleClass: 'link', text: 'show', onClick: ->(action) do
+            render \
+              'json_ui/garage/actions/dialogs_show',
+              json: json,
+              action: action,
+              dialog_mode: :show,
+              include_form: true
+          end
+        end
+      end
+    end
+    split.right childViews: ->(right) do
+      # right.button text: 'Submit', onClick: ->(action) { action.forms_submit }
+      right.fields_submit text: 'Submit'
+    end
+  end
+end

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

@@ -3,27 +3,6 @@ json.title 'Forms'
 page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
-page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', padding: glib_json_padding_body, childViews: ->(form) do
-  form.fields_text name: 'user[name]', width: 'matchParent', label: 'Name'
-  form.fields_password name: 'user[password]', width: 'matchParent', label: 'Password'
-
-  form.panels_split width: 'matchParent', content: ->(split) do
-    split.left childViews: ->(left) do
-      left.panels_horizontal height: 'matchParent', align: 'middle', childViews: ->(horizontal) do
-        case params[:mode]
-        when 'dialog'
-          horizontal.fields_hidden name: 'mode', value: 'dialog'
-          horizontal.button styleClass: 'link', text: 'cancel', onClick: ->(action) { action.dialogs_close }
-        when 'dialog_reload'
-          horizontal.button styleClass: 'link', text: 'back', onClick: ->(action) do
-            render 'json_ui/garage/actions/dialogs_show', json: json, action: action, dialog_mode: :reload
-          end
-        end
-      end
-    end
-    split.right childViews: ->(right) do
-      # right.button text: 'Submit', onClick: ->(action) { action.forms_submit }
-      right.fields_submit text: 'Submit'
-    end
-  end
+page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+  render 'json_ui/garage/forms/basic_content', panel: scroll
 end

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

@@ -26,6 +26,17 @@ page.form \
     end
     form.fields_datetime id: 'date2', name: 'user[datetime_end]', width: 'matchParent', label: 'End Date', min: '2010-01-01', max: '2012-01-01'
 
+    form.spacer height: 20
+    form.h2 text: 'Button Date'
+    form.label text: 'Plus 30 days'
+    form.spacer height: 6
+    form.fields_date name: 'user[date_start1]', label: 'Add start date', value: '2024-12-12', buttonTemplate: true, onChange: ->(action) do
+      action.logics_set targetId: 'date3', conditionalData: { value: { "sum_date": [{ "var": 'user[date_start1]' }, { value: 86400 * 30, format: 'date' }] } }
+    end
+    form.spacer height: 6
+    form.fields_date id: 'date3', name: 'user[date_end1]', label: 'End date', buttonTemplate: true
+
+
     form.spacer height: 20
     form.h2 text: 'Divided by 3 (with precision set)'
     form.spacer height: 6

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

@@ -70,6 +70,8 @@ page.form \
     max: '2021-03-01',
     value: '2021-11'
 
+
+
   if record.present?
     form.fields_datetime \
       prop: :created_at,
@@ -78,6 +80,22 @@ page.form \
       width: 'matchParent'
   end
 
+  form.spacer height: 8
+  form.fields_date \
+    name: 'user[due_date]',
+    label: 'Add due date',
+    buttonTemplate: true,
+    min: '2024-11-01',
+    max: '2024-12-31'
+  form.spacer height: 8
+
+  form.spacer height: 8
+  form.fields_datetime \
+    name: 'user[due_date1]',
+    label: 'Add due datetime',
+    buttonTemplate: true
+  form.spacer height: 8
+
   form.spacer height: 20
   form.h2 text: 'Country'
   form.spacer height: 6

data/app/views/json_ui/garage/tables/index.json.jbuilder

@@ -8,6 +8,9 @@ page.list firstSection: ->(section) do
     template.thumbnail title: 'Layout', onClick: ->(action) do
       action.windows_open url: json_ui_garage_url(path: 'tables/layout')
     end
+    template.thumbnail title: 'Nested table', onClick: ->(action) do
+      action.windows_open url: json_ui_garage_url(path: 'tables/nested_table')
+    end
     template.thumbnail title: 'Horizontal Scroll', onClick: ->(action) do
       action.windows_open url: json_ui_garage_url(path: 'tables/horizontal_scroll')
     end

data/app/views/json_ui/garage/tables/nested_table.json.jbuilder

@@ -0,0 +1,60 @@
+json.title 'Tables'
+
+page = json_ui_page json
+render "#{@path_prefix}/nav_menu", json: json, page: page
+
+page.form width: 'matchParent', childViews: ->(view) do
+  view.panels_table styleClass: 'table--plain', sections: [
+    ->(section) do
+      section.header cellViews: ->(header) do
+        header.label text: ''
+        header.label text: 'Month'
+        header.label text: 'Electicity'
+        header.label text: 'Sanitation Facility'
+        header.label text: 'Ground Irrigation'
+      end
+
+      items = [
+        { month: 'Jan', electricity: 1200, sanitation_facility: 500, ground_irrigation: 450 },
+        { month: 'Feb', electricity: 1150, sanitation_facility: 800, ground_irrigation: 440 },
+        { month: 'Mar', electricity: 1100, sanitation_facility: 700, ground_irrigation: 430 },
+        { month: 'Apr', electricity: 1000, sanitation_facility: 450, ground_irrigation: 420 }
+      ]
+      section.rows objects: items, builder: ->(row, item, index) do
+        row.default cellViews: ->(cell) do
+          cell.fields_check name: "row-#{index}", onIcon: 'keyboard_arrow_up', offIcon: 'keyboard_arrow_down', checkValue: true, onChange: ->(action) do
+          action.logics_set targetId: "nested-#{index}", conditionalData: {
+            displayed: { "var": "row-#{index}" }
+          }
+        end
+          cell.label text: item[:month]
+          cell.label text: item[:electricity]
+          cell.label text: item[:sanitation_facility]
+          cell.label text: item[:ground_irrigation]
+        end
+        row.default colSpans: [5], cellViews: ->(cell) do
+          cell.panels_table id: "nested-#{index}", displayed: false, width: 'matchParent', sections: [
+            ->(ssection) do
+              ssection.header cellViews: ->(header) do
+                header.label text: 'Filename'
+                header.label text: 'Uploaded At'
+                header.label text: ''
+              end
+
+              sitems = [
+                { filename: 'electricity-bill.png', uploaded_at: '2024-05-11' },
+                { filename: 'irrigation-bill.png', uploaded_at: '2024-05-11' }
+              ]
+              ssection.rows objects: sitems, builder: ->(srow, sitem, sindex) do
+                srow.default cellViews: ->(scell) do
+                  scell.label text: sitem[:filename]
+                  scell.label text: sitem[:uploaded_at]
+                end
+              end
+            end
+          ]
+        end
+      end
+    end
+  ]
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.17.0
+  version: 4.18.0
 platform: ruby
 authors:
 - ''
@@ -198,6 +198,7 @@ files:
 - app/views/json_ui/garage/empty.json.jbuilder
 - app/views/json_ui/garage/forms/_alert_post_all_data.json.jbuilder
 - app/views/json_ui/garage/forms/_alert_post_data.json.jbuilder
+- app/views/json_ui/garage/forms/_basic_content.json.jbuilder
 - app/views/json_ui/garage/forms/_conditional_banner.json.jbuilder
 - app/views/json_ui/garage/forms/_partial_update_execute.json.jbuilder
 - app/views/json_ui/garage/forms/_read_more_text.json.jbuilder
@@ -313,6 +314,7 @@ files:
 - app/views/json_ui/garage/tables/horizontal_scroll.json.jbuilder
 - app/views/json_ui/garage/tables/index.json.jbuilder
 - app/views/json_ui/garage/tables/layout.json.jbuilder
+- app/views/json_ui/garage/tables/nested_table.json.jbuilder
 - app/views/json_ui/garage/tables/panel_content.json.jbuilder
 - app/views/json_ui/garage/test_page/_header.json.jbuilder
 - app/views/json_ui/garage/test_page/auto_validate.json.jbuilder