egov_utils 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cc59966440f42860dfdb2f7df80df6e925f1d39cabf9b87daaeb68e6f31d5c6
-  data.tar.gz: 898c91aae9915d9e2f25205353bdf00cd6a10e2b348e0e332293a4545375c1d6
+  metadata.gz: d662d4819604ac94eb10520bbcaf61ae0c5131417c211f340766b026d9243dae
+  data.tar.gz: ee9510ce33f7a049a16412027ee1d966e8f343eda886ba8198b8699e14bbae4b
 SHA512:
-  metadata.gz: ccdf39526da488a8d85b211cd0ca9619a26205caa367f650d0eac1fd9a0e501203cbce50d27c149e42163cac182c1026085c613924a7bf8fdc8081b3df5868ec
-  data.tar.gz: d904c8195a19ab154e3153256559cf95874ba80252cd4e5a3c295d79192d966bcabaaa3bac05708a6ce0e2fc77a871d2612d469272b461805953503d827387d5
+  metadata.gz: f150dd50a3326b9879dc35fa0f7fefc0783f90cd74a977604f4207fc0487edd777a923455e9181c2478469ee9c8d780c709c274646681fd7b7fa34018ae8e9c6
+  data.tar.gz: 7e8dfb724d40a94c232d1504a1eb55b759ea0f93c5f367e6e5dbe2f1926b86fa1b810e5917e3a59fefa9335a51658ecb47e099d2c9bc2a4e4393d38c413f0149

data/app/helpers/egov_utils/grid_helper.rb

@@ -5,7 +5,7 @@ module EgovUtils
       case type
       when 'integer', 'float', 'decimal'
         'Number'
-      when 'string', 'list', 'love'
+      when 'string', 'text', 'list', 'love'
         'String'
       when 'date', 'datetime'
         'Date'
@@ -17,6 +17,7 @@ module EgovUtils
     end
 
     def field_for_grid(attribute)
+      binding.pry if attribute.type.nil?
       s = "\'"
       s << attribute.name
       s << '\': {path: "'

data/app/views/common/_grid.html.coffee

@@ -42,61 +42,59 @@ $ ->
       ]
 <% end %>
 
+  dataSource = new shield.DataSource
+    schema:
+      data: 'entities'
+      total: 'count'
+      fields:
+        <% schema.available_columns.each do |column| %>
+        <%= raw field_for_grid(column) %>
+        <% end %>
+    events:
+      error: (event) ->
+        if event.errorType == 'transport'
+          alert("Write error: " + event.error.statusText )
+          if event.operation == 'save'
+            this.read()
+        else
+          alert( event.errorType + " error: " + event.error )
+    remote:
+      read:
+        type: 'GET'
+        url: '<%= polymorphic_path(schema.model, schema.to_param.merge(additional_params).merge(format: :json)) %>'
+        dataType: 'json'
+        data: (params)->
+          dataObject = $.extend({}, params)
+          dataObject.offset = params.skip if params.skip
+          dataObject.limit = params.take if params.take
+          delete dataObject.skip
+          delete dataObject.take
+          dataObject
+      modify:
+        create: (items, success, error) ->
+          newItem = items[0]
+          $.ajax
+            url: '<%= polymorphic_path(schema.model, format: :json) %>'
+            type: 'POST'
+            dataType: 'json'
+            data: { <%= grid.model_name.name.underscore %>: newItem.data }
+            complete: (xhr) ->
+              if xhr.readyState == 4 and xhr.status == 201
+                newItem.data.id = xhr.responseJSON.id
+                success()
+                return
+              error(xhr)
+        # remove: (items, success, error) ->
+        #   $.ajax(
+        #     type: "DELETE"
+        #     url: "<%= polymorphic_path(schema.model) %>/" + items[0].data.id + '.json'
+        #     dataType: 'json'
+        #   ).then(success, error)
+      operations: ['sort', 'skip', 'take']
+
   $('#<%= grid_id %>').shieldGrid({
     noRecordsText: '<%= t('label_no_records') %>'
-    dataSource: {
-      schema:
-        data: 'entities'
-        total: 'count'
-        fields:
-          <% schema.available_columns.each do |column| %>
-          <%= raw field_for_grid(column) %>
-          <% end %>
-      events:
-        error: (event) ->
-          if event.errorType == 'transport'
-            alert("Write error: " + event.error.statusText )
-            if event.operation == 'save'
-              this.read()
-          else
-            alert( event.errorType + " error: " + event.error )
-      remote: {
-        read: {
-          type: 'GET'
-          url: '<%= polymorphic_path(schema.model, schema.to_param.merge(additional_params).merge(format: :json)) %>'
-          dataType: 'json'
-          data: (params)->
-            dataObject = $.extend({}, params)
-            dataObject.offset = params.skip if params.skip
-            dataObject.limit = params.take if params.take
-            delete dataObject.skip
-            delete dataObject.take
-            dataObject
-        }
-        modify: {
-          create: (items, success, error) ->
-            newItem = items[0]
-            $.ajax
-              url: '<%= polymorphic_path(schema.model, format: :json) %>'
-              type: 'POST'
-              dataType: 'json'
-              data: { <%= grid.model_name.name.underscore %>: newItem.data }
-              complete: (xhr) ->
-                if xhr.readyState == 4 and xhr.status == 201
-                  newItem.data.id = xhr.responseJSON.id
-                  success()
-                  return
-                error(xhr)
-          # remove: (items, success, error) ->
-          #   $.ajax(
-          #     type: "DELETE"
-          #     url: "<%= polymorphic_path(schema.model) %>/" + items[0].data.id + '.json'
-          #     dataType: 'json'
-          #   ).then(success, error)
-        }
-        operations: ['sort', 'skip', 'take']
-      }
-    },
+    dataSource: dataSource,
     paging:
       pageSize: <%= page_size %>
       messages:
@@ -112,12 +110,12 @@ $ ->
       <% if can?(:update, schema.model) || can?(:destroy, schema.model) %>
       {
         width: 150
-        title: " "
+        title: "<%= t('label_actions') %>"
         buttons: [
           <% if can?(:update, schema.model) %>
           {cls: 'btn btn-sm btn-primary', caption: '<%= t('label_edit') %>', click: editRecord},
           <% end %>
-         <%= additional_grid_edit_buttons(schema) %>
+          <%= additional_grid_edit_buttons(schema) %>
           # <% if can?(:destroy, schema.model) %>
           # {commandName: 'delete', caption: '<%= t('label_delete') %>'}
           # <% end %>

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -605,7 +605,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: The eGoverment utilities is set of functionalities to support basic eGoverment