engine2 1.0.4 → 1.0.9

data/lib/engine2/templates.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module Engine2
     BS_ANIMATION ||= "am-flip-x" # "am-fade"
@@ -62,8 +63,13 @@ module Engine2
             end
 
             def list_select length, options = {}
+                template = if options[:multiple]
+                    "fields/list_mselect"
+                else
+                    options[:optional] ? "fields/list_select_opt" : "fields/list_select"
+                end
                 options.merge({
-                    template: options[:optional] ? "fields/list_select_opt" : "fields/list_select",
+                    template: template,
                     length: length
                 })
             end
@@ -76,12 +82,26 @@ module Engine2
                 })
             end
 
+            def list_bsmselect length, options = {}
+                options.merge({
+                    template: "fields/list_bsmselect",
+                    length: length,
+                    animation: BS_ANIMATION
+                })
+            end
+
             def list_buttons options = {}
                 options.merge({
                     template: options[:optional] ? "fields/list_buttons_opt" : "fields/list_buttons"
                 })
             end
 
+            def list_mbuttons options = {}
+                options.merge({
+                    template: options[:optional] ? "fields/list_mbuttons_opt" : "fields/list_mbuttons"
+                })
+            end
+
             def select_picker options = {}
                 options.merge({
                     template: options[:optional] ? "fields/select_picker_opt" : "fields/select_picker"
@@ -108,8 +128,8 @@ module Engine2
                 })
             end
 
-            def typeahead_picker
-                {template: "fields/typeahead_picker", animation: BS_ANIMATION}
+            def typeahead_picker options = {}
+                {template: "fields/typeahead_picker", length: 20, limit: 10, min_length: 0, animation: BS_ANIMATION}.merge(options)
             end
 
             def email length
@@ -138,6 +158,10 @@ module Engine2
                 })
             end
 
+            def checkbox_button options = {}
+                {template: "fields/checkbox_button"}.merge(options)
+            end
+
             def radio_checkbox
                 {template: "fields/radio_checkbox"}
             end
@@ -162,6 +186,13 @@ module Engine2
                 })
             end
 
+            def date_picker options = {}
+                options.merge({
+                    template: "search_fields/date",
+                    animation: BS_ANIMATION
+                })
+            end
+
             def integer_range
                 {template: "search_fields/integer_range"}
             end
@@ -190,8 +221,8 @@ module Engine2
                 })
             end
 
-            def typeahead_picker
-                {template: "search_fields/typeahead_picker", animation: BS_ANIMATION}
+            def typeahead_picker options = {}
+                {template: "search_fields/typeahead_picker", limit: 10, min_length: 0, animation: BS_ANIMATION}.merge(options)
             end
 
             # def checkbox_search true_v = "1", false_v = "0"
@@ -221,9 +252,13 @@ module Engine2
                 {template: "search_fields/list_buttons"}
             end
 
+            def list_mbuttons
+                {template: "search_fields/list_mbuttons"}
+            end
+
             def decimal_date
                 {template: "search_fields/decimal_date_range", animation: BS_ANIMATION}
             end
         end
     end
-end
+end

data/lib/engine2/type_info.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module Engine2
-
     class TypeInfo
         def initialize model
             @model = model
@@ -73,6 +73,15 @@ module Engine2
             end
         end
 
+        def boolean field, true_value = true, false_value = false
+            modify_field field do |info|
+                info[:type] = :boolean
+                info[:true_value] = true_value
+                info[:false_value] = false_value
+                info[:validations][:boolean] = true
+            end
+        end
+
         def date_field field, format, model_format
             define_field field, :date do |info|
                 info[:format] = format
@@ -83,6 +92,13 @@ module Engine2
 
         def time_field field, format, model_format
             define_field field, :time do |info|
+            end
+            time field, format, model_format
+        end
+
+        def time field, format, model_format
+            modify_field field do |info|
+                info[:type] = :time
                 info[:format] = format
                 info[:model_format] = model_format
                 info[:validations][:time] = true
@@ -215,8 +231,8 @@ module Engine2
                 info[:multiple] = multiple
                 info[:table] = table
                 info[:store] = store
-                info[:store][:upload] ||= "#{Engine2::app}/store/upload"
-                info[:store][:files] ||= "#{Engine2::app}/store/files"
+                info[:store][:upload] ||= "#{Engine2::SETTINGS[:path]}/store/upload"
+                info[:store][:files] ||= "#{Engine2::SETTINGS[:path]}/store/files"
                 info[:transaction] = true
             end
         end
@@ -227,6 +243,12 @@ module Engine2
             end
         end
 
+        def length field, len
+            modify_field field do |info|
+                info[:length] = len
+            end
+        end
+
         def date_range from, to
             depends_on(from, to)
             modify_field from do |info|
@@ -244,15 +266,6 @@ module Engine2
             end
         end
 
-        def boolean field, true_value = 1, false_value = 0
-            modify_field field do |info|
-                info[:type] = :boolean
-                info[:true_value] = true_value
-                info[:false_value] = false_value
-                info[:validations][:boolean] = true
-            end
-        end
-
         def currency field, symbol = LOCS[:currency_symbol]
             modify_field field do |info|
                 info[:type] = :currency
@@ -294,27 +307,43 @@ module Engine2
             end
         end
 
-        def star_to_many_field assoc_name
+        def star_to_many_field assoc_name, schemes = Schemes::STMF_LINK
             assoc = @model.one_to_many_associations[assoc_name] || @model.many_to_many_associations[assoc_name]
             raise E2Error.new("'*_to_many' association '#{assoc_name}' not found for model '#{@model}'") unless assoc
             define_field assoc_name, :string do |info|
                 info[:type] = :star_to_many_field
+                info[:schemes] = schemes
                 info[:keys] = assoc[:keys]
                 info[:assoc_name] = assoc_name
-                info[:transaction] = true # ?
+                info[:transaction] = true
             end
         end
 
-        def list_select name, list
+        def list_select_bits values
+            values.each_with_index.map{|a, i|[1 << i, a]}.to_h
+        end
+
+        def list_select name, options
             modify_field name do |info|
                 info[:type] = :list_select
-                info[:list] = case list
-                    when Hash
-                        list.to_a
-                    else
-                        raise E2Error.new("type '#{list.class}' not supported for list_select modifier for field #{name}")
+                values = options[:values]
+
+                if options[:multiselect]
+                    info[:multiselect] = true
+                    case info[:otype]
+                    when :string
+                        info[:separator] = options[:separator] || ';'
+                        info[:validations].delete(:string_length)
+                    when :integer
+                        info[:validations].delete(:integer)
+                    end
+                    info[:max_length] = options[:max_length] || 3
+                    info[:max_length_html] = options[:max_length_html] || LOCS[:list_select_selected]
                 end
-                info[:validations][:list_select] = true
+
+                raise E2Error.new("type '#{values.class}' not supported for list_select modifier for field #{name}") unless values.is_a?(Hash)
+                info[:values] = values.to_a
+                info[:validations][:list_select] = true unless values.empty?
             end
         end
 
@@ -340,6 +369,5 @@ module Engine2
                 info[:sequence] = seq_name
             end
         end
-
     end
-end
+end

data/lib/engine2/version.rb

@@ -1,7 +1,8 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module Engine2
-    MAJOR, MINOR, TINY = [1, 0, 4]
+    MAJOR, MINOR, TINY = [1, 0, 9]
     VERSION = [MAJOR, MINOR, TINY].join('.').freeze
     def self.version
         VERSION

data/package.json

@@ -2,33 +2,39 @@
   "name": "engine2",
   "description": "engine2",
   "version": "1.0.0",
+  "license": "MIT",
   "scripts": {
-    "postinstall": "bower install",
+    "postinstall": "bower install --allow-root",
     "dev": "brunch w",
     "build": "brunch build --production"
   },
   "dependencies": {
-    "angular": "^1.5.8",
-    "angular-animate": "^1.5.8",
-    "angular-cookies": "^1.5.8",
-    "angular-local-storage": "0.1.5",
+    "@uirouter/angularjs": "1.0.23",
+    "@uirouter/core": "6.0.1",
+    "angular": "^1.8.0",
+    "angular-animate": "^1.8.0",
+    "angular-cookies": "^1.8.0",
+    "angular-drag-and-drop-lists": "^2.1.0",
+    "angular-load": "^0.5.0",
+    "angular-local-storage": "^0.7.0",
     "angular-motion": "^0.4.0",
-    "angular-route": "^1.5.8",
-    "angular-sanitize": "^1.5.8",
-    "angular-ui-tree": "2.22.1",
-    "bootstrap": "^3.3.0",
+    "angular-sanitize": "^1.8.0",
+    "angular-ui-tree": "^2.22.0",
+    "bootstrap": "^3.4.1",
     "bootstrap-additions": "0.3.1",
-    "font-awesome": "~4.7.0",
-    "lodash": "~4.17.0",
-    "ng-file-upload": "12.2.12"
+    "fork-awesome": "^1.1.7",
+    "json-to-pretty-yaml": "1.2.2",
+    "lodash": "^4.17.15",
+    "ng-file-upload": "^12.2.0",
+    "push.js": "^1.0.12"
   },
   "devDependencies": {
     "auto-reload-brunch": "^2.7.1",
-    "bower": "~1.8.0",
-    "brunch": "^2.9.1",
+    "bower": "^1.8.8",
+    "brunch": "^2.10.0",
     "clean-css-brunch": "^2.0.0",
-    "coffee-script-brunch": "^2.1.0",
-    "copycat-brunch": "^1.1.0",
+    "coffee-script-brunch": "^2.10.2",
+    "copycat-brunch": "^1.1.1",
     "css-brunch": "^2.6.1",
     "javascript-brunch": "^2.0.0",
     "ng-annotate-brunch": "^1.7.2",

data/views/fields/blob.slim

@@ -12,7 +12,7 @@ e2-action action="[f + '_blob_store!']"
       div
         input [
           type="file"
-          ng-disabled="info.disabled"
+          ng-disabled="field.disabled"
           ng-file-select="action.select($files)"
         ]
 

data/views/fields/bs_select.slim

@@ -2,9 +2,9 @@
   select [
     ng-model="action.record[f]"
     bs-options="v.id as v.value for v in values"
-    select-resource="info.render.resource"
+    select-resource="field.render.resource"
     bs-select=""
-    ng-disabled="info.disabled"
+    ng-disabled="field.disabled"
     class="form-control input-sm"
     e2-field=""
   ]

data/views/fields/bsselect_picker.slim

@@ -1,15 +1,15 @@
-e2-action action="[info.assoc, 'list']"
+e2-action action="[field.assoc, 'list']"
   .col-lg-7.col-md-8.col-sm-12
     button.btn.btn-default.btn-sm [
       type="button"
       ng-model="action.selected"
       bs-options="v.id as v.value for v in action.values"
       ng-change="action.change()"
-      ng-disabled="info.disabled"
-      ng-class="info.render.class"
+      ng-disabled="field.disabled"
+      ng-class="field.render.class"
       class="form-control input-sm"
 
-      data-animation="{{::info.render.animation}}"
+      data-animation="{{::field.render.animation}}"
       data-placeholder="..."
       data-html="true"
       bs-select=""

data/views/fields/bsselect_picker_opt.slim

@@ -1,4 +1,4 @@
-e2-action action="[info.assoc, 'list']"
+e2-action action="[field.assoc, 'list']"
   .col-lg-7.col-md-12.col-sm-12
     .input-group.input-group-sm
       button.btn.btn-default.btn-sm [
@@ -6,16 +6,16 @@ e2-action action="[info.assoc, 'list']"
         ng-model="action.selected"
         bs-options="v.id as v.value for v in action.values"
         ng-change="action.change()"
-        ng-disabled="info.disabled"
-        ng-class="info.render.class"
+        ng-disabled="field.disabled"
+        ng-class="field.render.class"
         class="form-control"
 
-        data-animation="{{::info.render.animation}}"
+        data-animation="{{::field.render.animation}}"
         data-placeholder="..."
         data-html="true"
         bs-select=""
         e2-field=""
       ]
       .input-group-btn
-        a.btn.btn-default ng-disabled="info.disabled || !action.selected" ng-click="action.reset()"
+        a.btn.btn-default ng-disabled="field.disabled || !action.selected" ng-click="action.reset()"
           span.glyphicon.glyphicon-remove

data/views/fields/checkbox.slim

@@ -1,11 +1,11 @@
 .col-lg-1
   .checkbox
     input [
-      ng-init="action.record[f] = action.record[f] || info.render.false_value"
+      ng-init="action.record[f] = action.record[f] || field.render.false_value"
       type="checkbox"
       ng-model="action.record[f]"
-      ng-true-value="{{::info.render.true_value}}"
-      ng-false-value="{{::info.render.false_value}}"
-      ng-disabled="info.disabled"
+      ng-true-value="{{::field.render.true_value}}"
+      ng-false-value="{{::field.render.false_value}}"
+      ng-disabled="field.disabled"
       e2-field=""
     ]

data/views/fields/checkbox_button.slim

@@ -0,0 +1,6 @@
+.col-lg-12
+  .div ng-init="(action.record[f] === null || action.record[f] === undefined) && (action.record[f] = field.render.false_value)" ng-model="action.record[f]" e2-field=""
+    a.btn.btn-default.btn-sm ng-show="action.record[f] === field.render.true_value" ng-class="action.record[f] === field.render.true_value && 'active'" ng-click="action.record[f] = field.render.false_value" ng-disabled="field.disabled"
+      span.glyphicon.glyphicon-check
+    a.btn.btn-default.btn-sm ng-show="action.record[f] === field.render.false_value" ng-click="action.record[f] = field.render.true_value" ng-disabled="field.disabled"
+      span.glyphicon.glyphicon-unchecked

data/views/fields/checkbox_buttons.slim

@@ -1,6 +1,6 @@
 .col-lg-12
-  .btn-group.btn-group-sm ng-init="(action.record[f] === undefined) && (action.record[f] = info.render.false_value)" ng-model="action.record[f]" e2-field=""
-    a.btn.btn-default ng-class="action.record[f] === info.render.true_value && 'active'" ng-click="action.record[f] = info.render.true_value" ng-disabled="info.disabled"
+  .btn-group.btn-group-sm ng-init="(action.record[f] === null || action.record[f] === undefined) && (action.record[f] = field.render.false_value)" ng-model="action.record[f]" e2-field=""
+    a.btn.btn-default ng-class="action.record[f] === field.render.true_value && 'active'" ng-click="action.record[f] = field.render.true_value" ng-disabled="field.disabled"
       span.glyphicon.glyphicon-check
-    a.btn.btn-default ng-class="action.record[f] === info.render.false_value && 'active'" ng-click="action.record[f] = info.render.false_value" ng-disabled="info.disabled"
+    a.btn.btn-default ng-class="action.record[f] === field.render.false_value && 'active'" ng-click="action.record[f] = field.render.false_value" ng-disabled="field.disabled"
       span.glyphicon.glyphicon-unchecked

data/views/fields/checkbox_buttons_opt.slim

@@ -1,8 +1,8 @@
 .col-lg-12
   .btn-group.btn-group-sm ng-model="action.record[f]" e2-field=""
-    a.btn.btn-default ng-class="action.record[f] === info.render.true_value && 'active'" ng-click="action.record[f] = info.render.true_value" ng-disabled="info.disabled"
+    a.btn.btn-default ng-class="action.record[f] === field.render.true_value && 'active'" ng-click="action.record[f] = field.render.true_value" ng-disabled="field.disabled"
       span.glyphicon.glyphicon-check
-    a.btn.btn-default ng-class="action.record[f] === info.render.false_value && 'active'" ng-click="action.record[f] = info.render.false_value" ng-disabled="info.disabled"
+    a.btn.btn-default ng-class="action.record[f] === field.render.false_value && 'active'" ng-click="action.record[f] = field.render.false_value" ng-disabled="field.disabled"
       span.glyphicon.glyphicon-unchecked
-    a.btn.btn-default ng-class="(action.record[f] === null || action.record[f] === undefined) && 'active'" ng-click="action.record[f] = null" ng-disabled="info.disabled"
+    a.btn.btn-default ng-class="(action.record[f] === null || action.record[f] === undefined) && 'active'" ng-click="action.record[f] = null" ng-disabled="field.disabled"
       span.glyphicon.glyphicon-off

data/views/fields/currency.slim

@@ -4,7 +4,7 @@
       type="text"
       ng-model="action.record[f]"
       class="form-control"
-      ng-disabled="info.disabled"
+      ng-disabled="field.disabled"
       e2-field=""
     ]
-    span.input-group-addon ng-bind="info.render.symbol"
+    span.input-group-addon ng-bind="field.render.symbol"

data/views/fields/date.slim

@@ -4,13 +4,13 @@
       type="text"
       class="form-control"
       ng-model="value"
-      ng-disabled="info.disabled"
+      ng-disabled="field.disabled"
 
-      data-date-format="{{::info.render.format}}"
-      data-animation="{{::info.render.animation}}"
+      data-date-format="{{::field.render.format}}"
+      data-animation="{{::field.render.animation}}"
       bs-datepicker=""
       e2-datepicker=""
-      e2-model-format="{{::info.render.model_format}}"
+      e2-model-format="{{::field.render.model_format}}"
       data-autoclose="1"
 
       e2-force-view-value=""