pxs-forms 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d50fc40d7619672b358b9a858d5fa475cad9c714e34b6b578e449972d092437
-  data.tar.gz: ddd3bcd39966224b7c2eb2803b3ca1db2bd31ce7afa20c7b4e8d90e2bdd7a887
+  metadata.gz: 14b39bac9452c6f1c71de938ea6ef066dba69a0d861048f7f8c691af49b51ee6
+  data.tar.gz: 1a96903d410a21e147dc3fcdfa00752178c7e45ae6dd2f3b3c3215a60069f18d
 SHA512:
-  metadata.gz: ce353d76d2f8363bd14a08899a8a96ccab5898bf73a1f819ea085aac5ffc7aa1f9d4be4d80d2db3fb259a90d9622917b107967d3ec7dd14545bd79c77774c369
-  data.tar.gz: 4ab2e5a3b321f4808715402c5ed2b2fe351a165325051c7e3dca4ec06b1d1f5ba6831b289bba57aa357343295cc9f1981492256f20b97259340020e9d26108f0
+  metadata.gz: 638a4ed2810a3e316043aad98a4720cde8317645171694ef026081e0fabe93588541236a35dd3f6854013bb79a9a45df29f060ed907ee821c9629c0906253553
+  data.tar.gz: ba16db0647f94210668ccf504bfa0c763ff62225be35cf431710f6466629ecd89d16fee5fe99387a8bacf188fa373c01fd88fe6792d5cdecd8a1dc0992f07eaf

data/lib/pxs/forms/model_form_builder.rb

@@ -37,11 +37,9 @@ class ModelFormBuilder < ActionView::Helpers::FormBuilder
             @object.type_for_attribute(attribute.to_s).try(:type)
         # else if @object matches a column
         elsif @object.respond_to?(:column_for_attribute) && @object.has_attribute?(attribute)
-            # return column type
             @object.column_for_attribute(attribute).try(:type)
         end
 
-        # default to string
         result || :string
     end
 
@@ -51,36 +49,36 @@ class ModelFormBuilder < ActionView::Helpers::FormBuilder
         field_block(attribute, options) do
             safe_join [
                 (field_label(attribute, options[:label]) unless options[:label] == false),
-                string_field(attribute, merge_input_options({class: "#{"is-invalid" if has_error?(attribute)}"}, options)),
+                string_field(attribute, merge_input_options({class: "#{"is-invalid" if has_error?(attribute)}"}, options[:input_html])),
             ]
         end
     end
 
-    def text_input(attribute, options = {})
+    def datetime_input(attribute, options, &block)
         field_block(attribute, options) do
             safe_join [
-            (field_label(attribute, options[:label]) unless options[:label] == false),
-            text_area(attribute, merge_input_options({class: "#{"is-invalid" if has_error?(attribute)}"}, options)),
+                (field_label(attribute, options[:label]) unless options[:label] == false), datetime_field(attribute, merge_input_options({class: "#{"is-invalid" if has_error?(attribute)}"}, options[:input_html])),
             ]
         end
     end
 
-    def boolean_input(attribute, options = {})
+    def text_input(attribute, options = {})
         field_block(attribute, options) do
-            tag.div(class: "checkbox-field") do
             safe_join [
-                check_box(attribute, merge_input_options({class: "checkbox-input"}, options)),
-                label(attribute, options[:label], class: "checkbox-label"),
+            (field_label(attribute, options[:label]) unless options[:label] == false),
+            text_area(attribute, merge_input_options({class: "#{"is-invalid" if has_error?(attribute)}"}, options[:input_html])),
             ]
-            end
         end
     end
 
-    def currency_input(attribute, options = {})
+    def boolean_input(attribute, options = {})
         field_block(attribute, options) do
+            tag.div(class: "checkbox-field") do
             safe_join [
-                (field_label(attribute, options[:label]) unless options[:label] == false), number_field(attribute, merge_input_options({class: "#{"is-invalid" if has_error?(attribute)}", step: "0.01", placeholder: "0.00"}, options))
+                check_box(attribute, merge_input_options({class: "checkbox-input"}, options[:input_html])),
+                label(attribute, options[:label], class: "checkbox-label"),
             ]
+            end
         end
     end
 
@@ -95,14 +93,14 @@ class ModelFormBuilder < ActionView::Helpers::FormBuilder
 
     def select_input(attribute, options = {})
 
-        value_method = options[:value_method] || :to_s
-        text_method = options[:text_method] || :to_s
+        value_method = options[:value_method] || :id
+        text_method = options[:text_method] || :name
         input_options = options || {}
 
         multiple = input_options[:multiple]
 
         collection_input(attribute, options) do
-            collection_select(attribute, options[:collection], value_method, text_method, options, merge_input_options({class: "#{"custom-select" unless multiple} #{"is-invalid" if has_error?(attribute)}"}, options))
+            collection_select(attribute, options[:collection], value_method, text_method, options[:select_options] || {}, merge_input_options({class: "#{"custom-select" unless multiple} #{"is-invalid" if has_error?(attribute)}"}, options[:input_html]))
         end
     end
 
@@ -110,7 +108,7 @@ class ModelFormBuilder < ActionView::Helpers::FormBuilder
 
         # We probably need to go back later and adjust this for more customization
         collection_input(attribute, options) do
-        grouped_collection_select(attribute, options[:collection], :last, :first, :to_s, :to_s, options, merge_input_options({class: "custom-select #{"is-invalid" if has_error?(attribute)}"}, options))
+        grouped_collection_select(attribute, options[:collection], :last, :first, :to_s, :to_s, options, merge_input_options({class: "custom-select #{"is-invalid" if has_error?(attribute)}"}, options[:input_html]))
       end
     end
 
@@ -160,6 +158,8 @@ class ModelFormBuilder < ActionView::Helpers::FormBuilder
                         }, {data: {date_select: true}})
                 },
             ]
+        when :datetime then
+            datetime_field(attribute, options)
         when :integer then number_field(attribute, options)
         when :string
             case attribute.to_s
@@ -197,7 +197,7 @@ class ModelFormBuilder < ActionView::Helpers::FormBuilder
 
     def error_text(attribute)
         if has_error? attribute
-            tag.div @object.errors[method].join("<br />").html_safe, class: "form-errors"
+            tag.div @object.errors[attribute].join("<br />").html_safe, class: "form-errors"
         end
     end
 

data/lib/pxs/forms/version.rb

@@ -2,6 +2,6 @@
 
 module Pxs
   module Forms
-    VERSION = "0.0.13"
+    VERSION = "0.0.15"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pxs-forms
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.15
 platform: ruby
 authors:
 - Poubelle
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-19 00:00:00.000000000 Z
+date: 2024-05-05 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: