netzke-basepack 0.12.0 → 0.12.1

data/lib/netzke/basepack/form.rb

@@ -1,5 +1,3 @@
-require "netzke/basepack/form/services"
-
 module Netzke
   module Basepack
     # Ext.form.Panel-based component
@@ -28,6 +26,7 @@ module Netzke
     # * +netzke_submit+ - gets called when the form gets submitted (e.g. by pressing the Apply button, or by calling onApply)
     # * +get_combobox_options+ - gets called when a 'remote' combobox field gets expanded
     class Form < Netzke::Base
+      include self::Endpoints
       include self::Services
       include Fields
       include DataAccessor

data/lib/netzke/basepack/form/endpoints.rb

@@ -0,0 +1,35 @@
+module Netzke
+  module Basepack
+    class Form < Netzke::Base
+      module Endpoints
+        extend ActiveSupport::Concern
+
+        included do
+          # Called when the form gets submitted (e.g. by pressing the Apply button)
+          endpoint :netzke_submit do |params, this|
+            data = ActiveSupport::JSON.decode(params[:data])
+            submit(data, this)
+          end
+
+          # Can be called when the form needs to load a record with given ID. E.g.:
+          #
+          #     someForm.netzkeLoad({id: 100});
+          endpoint :netzke_load do |params, this|
+            @record = data_class && data_adapter.find_record(params[:id])
+            this.set_form_values js_record_data
+          end
+
+          # Returns options for a combobox
+          # params receive:
+          # +attr+ - column's name
+          # +query+ - what's typed-in in the combobox
+          # +id+ - selected record id
+          endpoint :get_combobox_options do |params, this|
+            attr = fields[params[:attr].to_sym]
+            this.data = data_adapter.combo_data(attr, params[:query])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/netzke/basepack/form/services.rb

@@ -4,65 +4,33 @@ module Netzke
       module Services
         extend ActiveSupport::Concern
 
-        included do
-          #
-          # Endpoints
-
-          # Called when the form gets submitted (e.g. by pressing the Apply button)
-          endpoint :netzke_submit do |params, this|
-            data = ActiveSupport::JSON.decode(params[:data])
-            data.each_pair do |k,v|
-              # Ext JS returns "null" on empty date fields, or "" for not filled optional integer fields, which gives
-              # errors when passed to model (at least in DataMapper)
-              data[k]=nil if v == "" || v == "null"
-            end
-
-            # File uploads are in raw params instead of "data" hash, so, mix them in into "data"
-            controller.params.each_pair do |k,v|
-              data[k] = v if v.is_a?(ActionDispatch::Http::UploadedFile)
-            end
-
-            success = create_or_update_record(data)
-
-            if success
-              this.set_form_values(js_record_data)
-              this.success = true # respond to classic form submission with {success: true}
-              this.on_submit_success # inform the Netzke endpoint caller about success
-            else
-              # flash eventual errors
-              data_adapter.errors_array(@record).each do |error|
-                flash :error => error
-              end
-              this.netzke_feedback(@flash)
-              this.apply_form_errors(build_form_errors(record))
-            end
+        def submit(data, this)
+          # File uploads are in raw params instead of "data" hash, so, mix them in into "data"
+          controller.params.each_pair do |k,v|
+            data[k] = v if v.is_a?(ActionDispatch::Http::UploadedFile)
           end
 
-          # Can be called when the form needs to load a record with given ID. E.g.:
-          #
-          #     someForm.netzkeLoad({id: 100});
-          endpoint :netzke_load do |params, this|
-            @record = data_class && data_adapter.find_record(params[:id])
-            this.set_form_values js_record_data
-          end
+          success = create_or_update_record(data)
 
-          # Returns options for a combobox
-          # params receive:
-          # +attr+ - column's name
-          # +query+ - what's typed-in in the combobox
-          # +id+ - selected record id
-          endpoint :get_combobox_options do |params, this|
-            attr = fields[params[:attr].to_sym]
-            this.data = data_adapter.combo_data(attr, params[:query])
+          if success
+            this.set_form_values(js_record_data)
+            this.success = true # respond to classic form submission with {success: true}
+            this.on_submit_success # inform the Netzke endpoint caller about success
+          else
+            # flash eventual errors
+            data_adapter.errors_array(@record).each do |error|
+              flash :error => error
+            end
+            this.netzke_feedback(@flash)
+            this.apply_form_errors(build_form_errors(record))
           end
-
         end
 
         def values
           record && record.netzke_hash(fields)
         end
 
-      private
+        private
 
         # Builds the form errors
         def build_form_errors(record)
@@ -88,7 +56,7 @@ module Netzke
         def create_or_update_record(hsh)
           hsh.merge!(config[:strong_default_attrs]) if config[:strong_default_attrs]
           @record ||= data_adapter.find_record hsh.delete(data_class.primary_key.to_s) # only pick up the record specified in the params if it was not provided in the configuration
-            #data_class.find(:first, :conditions => {data_class.primary_key => hsh.delete(data_class.primary_key)})
+          #data_class.find(:first, :conditions => {data_class.primary_key => hsh.delete(data_class.primary_key)})
           success = true
 
           @record = data_class.new if @record.nil?
@@ -97,20 +65,9 @@ module Netzke
             data_adapter.set_record_value_for_attribute(@record, fields[k.to_sym].nil? ? {:name => k} : fields[k.to_sym], v, config.role || :default)
           end
 
-          #hsh.each_pair do |k,v|
-            #begin
-              #@record.send("#{k}=",v)
-            #rescue StandardError => exc
-              #flash :error => exc.message
-              #success = false
-              #break
-            #end
-          #end
-
           # did we have complete success?
           success && data_adapter.save_record(@record)
         end
-
       end
     end
   end

data/lib/netzke/basepack/grid.rb

@@ -1,10 +1,6 @@
-require "netzke/basepack/grid/services"
-require 'netzke/basepack/column_config'
-
 module Netzke
   module Basepack
-    # {Ext.grid.Panel}[http://docs.sencha.com/ext-js/4-1/#!/api/Ext.grid.Panel] -based component with the following
-    # features:
+    # Ext.grid.Panel-based component with the following features:
     #
     # * automatic column configuration based on used ORM
     # * pagination
@@ -368,11 +364,14 @@ module Netzke
       # JavaScript class configuration
       js_configure do |c|
         c.extend = "Ext.grid.Panel"
-        c.mixin :grid, :event_handling
+        c.mixin :grid
         c.mixin :advanced_search if advanced_search_available
         c.mixin :edit_in_form if edit_in_form_available
         c.mixin :remember_selection if remember_selection_available
 
+        c.mixins << "Netzke.mixins.Basepack.Columns"
+        c.mixins << "Netzke.mixins.Basepack.GridEventHandlers"
+
         c.translate *%w[are_you_sure confirmation]
 
         # JavaScript includes
@@ -466,7 +465,7 @@ module Netzke
 
       action :add do |a|
         a.disabled = config[:prohibit_create]
-        a.handler = "onAddInline" # overriding naming conventions as Ext 4 grid has its own onAdd method
+        a.handler = "onAddRecord" # overriding naming conventions as Ext 4 grid has its own onAdd method
         a.icon = :add
       end
 

data/lib/netzke/basepack/grid/endpoints.rb

@@ -31,7 +31,6 @@ module Netzke
           # +query+ - what's typed-in in the combobox
           # +id+ - selected record id
           endpoint :get_combobox_options do |params, this|
-            ::Rails.logger.debug "\n!!! params: #{params.inspect}\n"
             column = final_columns.detect{ |c| c[:name] == params[:attr] }
             this.data = data_adapter.combo_data(column, params[:query])
           end

data/lib/netzke/basepack/grid/javascripts/extensions.js

@@ -23,6 +23,7 @@ Ext.define('Netzke.classes.Basepack.Grid.Proxy', {
   extend: 'Ext.data.proxy.Server',
 
   batch: function(options) {
+    console.log("options ", options);
     if (!options) return;
     for (operation in options.operations) {
       var op = new Ext.data.Operation({action: operation, records: options.operations[operation]});
@@ -32,6 +33,7 @@ Ext.define('Netzke.classes.Basepack.Grid.Proxy', {
 
   destroy: function(op, callback, scope) {
     var data = Ext.Array.map(op.getRecords(), function(r) { return r.getData().id; });
+    console.log("data ", data);
     var store = this.grid.getStore();
     this.grid.serverDelete(data, function(res){
       var errors = [];

data/lib/netzke/basepack/grid/javascripts/grid.js

@@ -1,9 +1,4 @@
 {
-  trackMouseOver: true,
-  loadMask: true,
-  autoScroll: true,
-
-  componentLoadMask: {msg: "Loading..."},
   multiSelect: true,
 
   initComponent: function(){
@@ -21,15 +16,8 @@
     // Normalize columns. Extract data fields and meta column.
     this.netzkeProcessColumns();
 
-    // Define the model
-    if (!Netzke.isModelDefined(this.id)) {
-      Ext.define(Netzke.modelName(this.id), {
-        extend: 'Ext.data.Model',
-        idProperty: this.pri, // Primary key
-        fields: this.fields
-      });
-    }
-    delete this.pri;
+    this.netzkeBuildModel('Ext.data.Model');
+
     delete this.fields;
 
     // Prepare column model config with columns in the correct order; columns out of order go to the end.
@@ -113,9 +101,6 @@
       if (this.actions.edit) this.actions.edit.setDisabled(selModel.getCount() != 1 || this.prohibitUpdate);
     }, this);
 
-    // WIP: GridView
-    this.getView().getRowClass = this.netzkeDefaultGetRowClass;
-
     // When starting editing as assocition column, pre-load the combobox store from the meta column, so that we don't see the real value of this cell (the id of the associated record), but rather the associated record by the configured method.
     this.on('beforeedit', function(editor, e){
       if (e.column.assoc && e.record.get('meta') && e.column.getEditor()) {
@@ -165,73 +150,6 @@
     }
   },
 
-  netzkeProcessColumns: function() {
-    this.fields = [];
-
-    // Run through columns and set up different configuration for each
-    Ext.each(this.columns, function(c, i){
-
-      this.netzkeNormalizeRenderer(c);
-
-      // Build the field configuration for this column
-      var fieldConfig = {name: c.name, defaultValue: c.defaultValue, useNull: true}; // useNull is needed to not convert nils to 0 in associations!
-
-      if (c.name !== 'meta') fieldConfig.type = this.netzkeFieldTypeForAttrType(c.attrType); // field type (grid editors need this to function well)
-
-      if (c.attrType == 'datetime') {
-        fieldConfig.dateFormat = 'Y-m-d H:i:s'; // set the format in which we receive datetime from the server (so that the model can parse it)
-
-        // While for 'date' columns the renderer is set up automatically (through using column's xtype), there's no appropriate xtype for our custom datetime column.
-        // Thus, we need to set the renderer manually.
-        // NOTE: for Ext there's no distinction b/w date and datetime; date fields can include time.
-        if (!c.renderer) {
-          // format in which the data will be rendered; if c.format is nil, Ext.Date.defaultFormat extended with time will be used
-          c.renderer = Ext.util.Format.dateRenderer(c.format || Ext.Date.defaultFormat + " H:i:s");
-        }
-      };
-
-      if (c.attrType == 'date') {
-        // If no dateFormat given for date attrType, Timezone translation can subtract zone offset from 00:00:00 causing previous day.
-        fieldConfig.dateFormat = 'Y-m-d';
-      };
-
-      // because checkcolumn doesn't care about editor (not) being set, we need to explicitely set readOnly here
-      if (c.xtype == 'checkcolumn' && !c.editor) {
-        c.readOnly = true;
-      }
-
-      this.fields.push(fieldConfig);
-
-      // We will not use meta columns as actual columns (not even hidden) - only to create the records
-      if (c.meta) {
-        this.metaColumn = c;
-        return;
-      }
-
-      // Set rendeder for association columns (the one displaying associations by the specified method instead of id)
-      if (c.assoc) {
-        // Editor for association column
-        if (c.editor) c.editor = Ext.apply({ name: c.name }, c.editor);
-
-        // Renderer for association column
-        this.netzkeNormalizeAssociationRenderer(c);
-      }
-
-      if (c.editor) {
-        Ext.applyIf(c.editor, {selectOnFocus: true, netzkeParent: this});
-      }
-
-      // Setting the default filter type
-      if (c.filterable != false && !c.filter) {
-        c.filter = {type: c.assoc ? 'string' : this.netzkeFilterTypeForAttrType(c.attrType)};
-      }
-
-      // setting dataIndex
-      c.dataIndex = c.name;
-
-    }, this);
-  },
-
   netzkeBuildStore: function() {
     var store = Ext.create('Ext.data.Store', Ext.apply({
       model: Netzke.modelName(this.id),
@@ -261,124 +179,5 @@
 
   netzkeBuildReader: function() {
     return Ext.create('Netzke.classes.Basepack.Grid.ArrayReader');
-  },
-
-  netzkeFilterTypeForAttrType: function(attrType){
-    var map = {
-      integer   : 'number',
-      decimal   : 'number',
-      float     : 'number',
-      datetime  : 'date',
-      date      : 'date',
-      string    : 'string',
-      text      : 'string',
-      'boolean' : 'boolean'
-    };
-    return map[attrType] || 'string';
-  },
-
-  netzkeFieldTypeForAttrType: function(attrType){
-    var map = {
-      integer   : 'int',
-      decimal   : 'float',
-      float     : 'float',
-      datetime  : 'date',
-      date      : 'date',
-      string    : 'string',
-      text      : 'string',
-      'boolean' : 'boolean'
-    };
-    return map[attrType] || 'string';
-  },
-
-  // Tries editing the first editable (i.e. not hidden, not read-only) sell
-  netzkeTryStartEditing: function(r){
-    var editableIndex = 0;
-    Ext.each(this.initialConfig.columns, function(c){
-      // skip columns that cannot be edited
-      if (!(c.hidden == true || !c.editor || c.attrType == 'boolean')) {
-        return false;
-      }
-      editableIndex++;
-    });
-
-    if (editableIndex < this.initialConfig.columns.length) {this.getPlugin('celleditor').startEdit(r, this.columns[editableIndex]);}
-  },
-
-  netzkeDefaultGetRowClass: function(r){
-    return r.isNew ? "grid-dirty-record" : ""
-  },
-
-  // Normalizes the renderer for a column.
-  // Renderer may be:
-  // 1) a string that contains the name of the function to be used as renderer.
-  // 2) an array, where the first element is the function name, and the rest - the arguments
-  // that will be passed to that function along with the value to be rendered.
-  // The function is searched in the following objects: 1) Ext.util.Format, 2) this.
-  // If not found, it is simply evaluated. Handy, when as renderer we receive an inline JS function,
-  // or reference to a function in some other scope.
-  // So, these will work:
-  // * "uppercase"
-  // * ["ellipsis", 10]
-  // * ["substr", 3, 5]
-  // * "myRenderer" (if this.myRenderer is a function)
-  // * ["Some.scope.Format.customRenderer", 10, 20, 30] (if Some.scope.Format.customRenderer is a function)
-  // * "function(v){ return 'Value: ' + v; }"
-  netzkeNormalizeRenderer: function(c) {
-    if (!c.renderer) return;
-
-    var name, args = [];
-
-    if ('string' === typeof c.renderer) {
-      name = c.renderer.camelize(true);
-    } else {
-      name = c.renderer[0];
-      args = c.renderer.slice(1);
-    }
-
-    // First check whether Ext.util.Format has it
-    if (Ext.isFunction(Ext.util.Format[name])) {
-       c.renderer = Ext.Function.bind(Ext.util.Format[name], this, args, 1);
-    } else if (Ext.isFunction(this[name])) {
-      // ... then if our own class has it
-      c.renderer = Ext.Function.bind(this[name], this, args, 1);
-    } else {
-      // ... and, as last resort, evaluate it (allows passing inline javascript function as renderer)
-      eval("c.renderer = " + c.renderer + ";");
-    }
-  },
-
-  netzkeSaveColumns: function(){
-    var cols = [];
-    this.getView().getHeaderCt().items.each(function(c){
-      cols.push({name: c.name, width: c.width, hidden: c.hidden});
-    });
-
-    this.serverSaveColumns(cols);
-  },
-
-  /*
-  Set a renderer that displayes association values instead of association record ID.
-  The association values are passed in the meta-column under associationValues hash.
-  */
-  netzkeNormalizeAssociationRenderer: function(c) {
-    c.scope = this;
-    var passedRenderer = c.renderer; // renderer we got from netzkeNormalizeRenderer
-    c.renderer = function(value, a, r, ri, ci, store, view){
-      var column = view.headerCt.items.getAt(ci),
-          editor = column.getEditor && column.getEditor(),
-          recordFromStore = editor && editor.isXType('combobox') && editor.getStore().findRecord('value', value),
-          renderedValue;
-
-      if (recordFromStore) {
-        renderedValue = recordFromStore.get('text');
-      } else if (c.assoc && r.get('meta')) {
-        renderedValue = r.get('meta').associationValues[c.name] || c.emptyText;
-      } else {
-        renderedValue = value;
-      }
-
-      return passedRenderer ? passedRenderer.call(this, renderedValue) : renderedValue;
-    };
   }
 }