xsdk-scaffold-rails 0.1.9 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4de7a337b36092618e2f8c4d13b22cac4b6427a7ab4b3631c03236f9cbd9735b
-  data.tar.gz: 338b0258c5a76e1cab60ec800080352317f695546ef5957e04985b73e8157ee5
+  metadata.gz: 28851d6c097ba72105793a5a26aed4eedd9ae413da24c802d02af1afbafa428b
+  data.tar.gz: a5ffc5bc72948b77f3c0758b0cfe4b66520d1f429c3463d29067a79e2b469107
 SHA512:
-  metadata.gz: aa6ffd5f544cdbb8fd943b9c076f958644bc2841010d058e9c4a57d0688d166f180df6a2a9fe5d2513fa93b6db1bcb2860bc013442bb024f6944cb43007a50a6
-  data.tar.gz: 820733e0d444a5cdcb03564d8611c3cb763859d4343edead5f6668db425ac18694160fce65a2a9f83e1a2da373b24a8110b807f22182a7b02ab146b58e02c204
+  metadata.gz: db15834104004ab36312f8a547fd147dc81d825f65df98e6cb7301d3b20e5a9bb65aafd9624cbf2f7b967b7837184e2476c7340ddba1b1219aea3d37952082ae
+  data.tar.gz: 037ec03650a94222c3a9f6ab003f63ce9168c6497018e50bc566ae7fe024c65b8a1cb8cd306fe106d3449cf715f0430ab1bc9eabaca64f0f570a6c5e42a44460

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xsdk-scaffold-rails (0.1.7)
+    xsdk-scaffold-rails (0.1.12)
       activerecord (>= 6.0.0)
       pg (>= 1.1)
 
@@ -42,7 +42,7 @@ GEM
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
-    pg (1.2.3)
+    pg (1.3.5)
     racc (1.5.2)
     rack (2.2.3)
     rainbow (3.0.0)
@@ -127,4 +127,4 @@ DEPENDENCIES
   xsdk-scaffold-rails!
 
 BUNDLED WITH
-   2.2.17
+   2.3.10

data/lib/xsdk/scaffold/rails/base_datatable.rb

@@ -28,10 +28,16 @@ module Xsdk
           sort = @options[:sortBy]
           direction = @options[:sortDesc]
           order_string = sort.map.with_index { |k, idx| "#{sorting_map[k.to_sym]} #{direction[idx] ? 'DESC' : 'ASC'}" }
-          data.limit(per_page)
-              .offset(page * per_page)
-              .order(order_string)
-              .as_json(methods: methods + enum_methods, except: keys_to_exclude, include: has_many_include)
+          
+          if per_page > 0
+            data = data.limit(per_page).offset(page * per_page)
+          end
+          
+          data.order(order_string).as_json(
+            methods: methods + enum_methods,
+            except: keys_to_exclude,
+            include: has_many_include
+          )
         end
 
         def keys_to_exclude
@@ -61,7 +67,7 @@ module Xsdk
             table_name = @foreign_keys[key][0][:class_name].constantize.table_name
             "#{table_name}.#{value[:source]} AS #{value[:relation]}_#{value[:source]}"
           end
-          data = data.select("#{@clazz.to_s.underscore.pluralize}.*", *to_select)
+          data = data.select("#{@clazz.table_name}.*", *to_select)
 
           associations.select { |_k, v| v[:association_type] == :has_many }.each do |_, v|
             data = data.includes(v[:join]).references(v[:join])
@@ -89,7 +95,7 @@ module Xsdk
 
         # Build columns
         def build_headers
-          headers = columns.map do |c|
+          headers = columns_orderd.map do |c|
             {
               value: c, # warehouse_id
               table_value: get_table_value(c),	# "mag1"
@@ -167,6 +173,14 @@ module Xsdk
           @options[:transient_columns] || {}
         end
 
+        def column_name_ordered_list
+          []
+        end
+
+        def columns_orderd
+          column_name_ordered_list + (columns - column_name_ordered_list)
+        end
+
         def columns
           @clazz.column_names - %w[created_at updated_at] + transient_columns.keys
         end

data/lib/xsdk/scaffold/rails/version.rb

@@ -1,7 +1,7 @@
 module Xsdk
   module Scaffold
     module Rails
-      VERSION = "0.1.9"
+      VERSION = "0.1.12"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xsdk-scaffold-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.12
 platform: ruby
 authors:
 - Davide Croci
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord