netzke-basepack 0.3.5 → 0.3.6

data/lib/netzke/form_panel_extras/javascripts/xcheckbox.js

@@ -0,0 +1,82 @@
+/**
+ * Ext.ux.form.XCheckbox - checkbox with configurable submit values
+ *
+ * @author  Ing. Jozef Sakalos
+ * @version $Id: Ext.ux.form.XCheckbox.js 441 2009-01-12 11:10:10Z jozo $
+ * @date    10. February 2008
+ *
+ *
+ * @license Ext.ux.form.XCheckbox is licensed under the terms of
+ * the Open Source LGPL 3.0 license.  Commercial use is permitted to the extent
+ * that the code/component(s) do NOT become part of another Open Source or Commercially
+ * licensed development library or toolkit without explicit permission.
+ * 
+ * License details: http://www.gnu.org/licenses/lgpl.html
+ */
+
+/*global Ext */
+
+/**
+  * @class Ext.ux.XCheckbox
+  * @extends Ext.form.Checkbox
+  */
+Ext.ns('Ext.ux.form');
+Ext.ux.form.XCheckbox = Ext.extend(Ext.form.Checkbox, {
+     submitOffValue:'false'
+    ,submitOnValue:'true'
+
+    ,onRender:function() {
+
+        this.inputValue = this.submitOnValue;
+
+        // call parent
+        Ext.ux.form.XCheckbox.superclass.onRender.apply(this, arguments);
+
+        // create hidden field that is submitted if checkbox is not checked
+        this.hiddenField = this.wrap.insertFirst({tag:'input', type:'hidden'});
+
+        // support tooltip
+        if(this.tooltip) {
+            this.imageEl.set({qtip:this.tooltip});
+        }
+
+        // update value of hidden field
+        this.updateHidden();
+
+    } // eo function onRender
+
+    /**
+     * Calls parent and updates hiddenField
+     * @private
+     */
+    ,setValue:function(v) {
+        v = this.convertValue(v);
+        this.updateHidden(v);
+        Ext.ux.form.XCheckbox.superclass.setValue.apply(this, arguments);
+    } // eo function setValue
+
+    /**
+     * Updates hiddenField
+     * @private
+     */
+    ,updateHidden:function(v) {
+        v = undefined !== v ? v : this.checked;
+        v = this.convertValue(v);
+        if(this.hiddenField) {
+            this.hiddenField.dom.value = v ? this.submitOnValue : this.submitOffValue;
+            this.hiddenField.dom.name = v ? '' : this.el.dom.name;
+        }
+    } // eo function updateHidden
+
+    /**
+     * Converts value to boolean
+     * @private
+     */
+    ,convertValue:function(v) {
+        return (v === true || v === 'true' || v == 1 || v === this.submitOnValue || String(v).toLowerCase() === 'on');
+    } // eo function convertValue
+
+}); // eo extend
+
+// register xtype
+Ext.reg('xcheckbox', Ext.ux.form.XCheckbox);

data/lib/netzke/form_panel_extras/javascripts/xdatetime.js

@@ -37,7 +37,7 @@ Ext.ux.form.DateTime = Ext.extend(Ext.form.Field, {
     /**
      * @cfg {Number} timeWidth Width of time field in pixels (defaults to 100)
      */
-    ,timeWidth:100
+    ,timeWidth:80
     /**
      * @cfg {String} dtSeparator Date - Time separator. Used to split date and time (defaults to ' ' (space))
      */

data/lib/netzke/form_panel_extras/js_builder.rb

@@ -20,7 +20,7 @@ module Netzke
               name:field.name, 
               mapping:index++
             });
-            field.hideLabel = field.hidden; // completely hide the field marked "hidden"
+            field.hideLabel = field.hidden; // completely hide fields marked "hidden"
             var extConfig;
             try{
               extConfig = Ext.decode(field.extConfig)
@@ -52,12 +52,13 @@ module Netzke
   				    }
 				    },
             :defaults       => {
-              :anchor       => '-20', # to leave some space for the scrollbar
-              :listeners      => {
+              # :anchor       => '-20', # to leave some space for the scrollbar
+              :width => 180,
+              :listeners    => {
         				:specialkey => {
         				  :fn => <<-JS.l,
           				  function(field, event){
-            					if (event.getKey() == 13) this.submit();
+            					if (event.getKey() == 13) this.apply();
             				}
         				  JS
         				  :scope => this
@@ -88,10 +89,9 @@ module Netzke
                 }
               }
             JS
-            :refresh_click => <<-JS.l,
+            :refresh=> <<-JS.l,
               function() {
                 this.feedback('Implement me!');
-                // this.loadRecord(3)
               }
             JS
             :previous => <<-JS.l,
@@ -106,7 +106,7 @@ module Netzke
                 this.loadRecord(currentId, 'next');
               }
             JS
-            :submit => <<-JS.l,
+            :apply => <<-JS.l,
               function() {
                 this.form.submit({
                   url:this.initialConfig.interface.submit,

data/lib/netzke/grid_panel.rb

@@ -1,5 +1,9 @@
 require 'searchlogic'
+require "app/models/netzke_grid_panel_column"
+
 module Netzke
+  #
+  # GridPanel
   #
   # Functionality:
   # * data operations - get, post, delete, create
@@ -12,66 +16,58 @@ module Netzke
   # * properties and column configuration
   #
   class GridPanel < Base
-    # so that some inherited methods would know our real location
-    self.widget_file = __FILE__
-    
-    # include javascripts from Ext examples
-    ext_js_include  "examples/grid-filtering/menu/EditableItem.js", 
-                    "examples/grid-filtering/menu/RangeMenu.js",
-                    "examples/grid-filtering/grid/GridFilters.js"
-    
-    %w{Boolean Date List Numeric String}.unshift("").each do |f|
-      ext_js_include "examples/grid-filtering/grid/filter/#{f}Filter.js"
+    # Class-level configuration with defaults
+    def self.config
+      set_default_config({
+        :column_manager => "NetzkeGridPanelColumn",
+        :enable_filters => false
+      })
     end
 
-    # include ruby code in grid_panel_extras
-    include_extras
+    include Netzke::GridPanelExtras::JsBuilder
+    include Netzke::GridPanelExtras::Interface
+    include Netzke::DbFields # database field operations
+
+    # javascripts for grid-filtering (from Ext examples)
+    if Netzke::GridPanel.config[:enable_filters]
+      js_include :ext_examples => %w{grid-filtering/menu/EditableItem.js grid-filtering/menu/RangeMenu.js grid-filtering/grid/GridFilters.js}
+    
+      js_include :ext_examples => %w{Boolean Date List Numeric String}.unshift("").map{|f| "grid-filtering/grid/filter/#{f}Filter.js" }
+      
+      js_include "#{File.dirname(__FILE__)}/grid_panel_extras/javascripts/filters.js"
+    end
+    
+    # extra javascripts
+    js_include "#{File.dirname(__FILE__)}/grid_panel_extras/javascripts/check-column.js"
 
     # define connection points between client side and server side of GridPanel. 
     # See implementation of equally named methods in the GridPanelExtras::Interface module.
     interface :get_data, :post_data, :delete_data, :resize_column, :move_column, :get_cb_choices
 
-    # database field operations
-    include Netzke::DbFields
-
-    module ClassMethods
-      def widget_type
-        :grid
-      end
-
-      # Global GridPanel configuration
-      def config
-        set_default_config({
-          :column_manager => "NetzkeGridPanelColumn"
-        })
-      end
-
-      def column_manager_class
-        config[:column_manager].constantize
-      rescue
-        nil
-      end
-      
+    # widget type for DbFields
+    # TODO: ugly, rethink
+    def self.widget_type
+      :grid
     end
-    extend ClassMethods
 
-    def layout_manager_class
-      self.class.layout_manager_class
+    def self.column_manager_class
+      config[:column_manager].constantize
+    rescue
+      nil
     end
 
     def column_manager_class
       self.class.column_manager_class
     end
 
-    # default grid configuration
+    # default instance-level configuration
     def initial_config
       {
         :ext_config => {
-          :config_tool           => false,
-          :enable_column_filters => Netzke::Base.config[:grid_panel][:filters],
+          :config_tool           => true,
+          :enable_column_filters => Netzke::GridPanel.config[:enable_filters],
           :enable_column_move    => true,
-          :enable_column_resize  => true,
-          :load_mask             => true
+          :enable_column_resize  => true
         },
         :persistent_layout => true,
         :persistent_config => true
@@ -82,7 +78,7 @@ module Netzke
       ["FieldsConfigurator"] # TODO: make this happen automatically
     end
 
-    def property_widgets
+    def configuration_widgets
       res = []
       res << {
         :name              => 'columns',
@@ -94,28 +90,14 @@ module Netzke
 
       res << {
         :name               => 'general',
-        :widget_class_name  => "PreferenceGrid",
-        :host_widget_name   => id_name,
-        :default_properties => available_permissions.map{ |k| {:name => "permissions.#{k}", :value => @permissions[k.to_sym]}},
+        :widget_class_name  => "PropertyEditor",
+        :widget_name   => id_name,
         :ext_config         => {:title => false}
       }
       
       res
     end
 
-    def properties__general__load_source(params = {})
-      w = aggregatee_instance(:properties__general)
-      w.interface_load_source(params)
-    end
-
-    protected
-    
-    def available_permissions
-      %w(read update create delete)
-    end
-
-    public
-
     # get columns from layout manager
     def get_columns
       @columns ||=
@@ -129,28 +111,28 @@ module Netzke
     end
     
     def tools
-      [{:id => 'refresh', :on => {:click => 'refreshClick'}, :qtip => 'Refresh'}]
+      %w{ refresh }
     end
 
     def actions
-      [{
-        :text => 'Add', :handler_name => 'add', :disabled => !@permissions[:create], :id => 'add'
-      },{
-        :text => 'Edit', :handler_name => 'edit', :disabled => !@permissions[:update], :id => 'edit'
-      },{
-        :text => 'Delete', :handler_name => 'delete', :disabled => !@permissions[:delete], :id => 'delete'
-      },{
-        :text => 'Apply', :handler_name => 'submit', :disabled => !@permissions[:update] && !@permissions[:create], :id => 'apply'
-      }]
+      { :add    => {:text => 'Add', :disabled => !@permissions[:create]},
+        :edit   => {:text => 'Edit', :disabled => !@permissions[:update]},
+        :delete => {:text => 'Delete', :disabled => !@permissions[:delete]},
+        :apply  => {:text => 'Apply', :disabled => !@permissions[:update] && !@permissions[:create]}
+      }
     end
 
+    def bbar
+      persistent_config[:bottom_bar] ||= config[:bbar] == false ? nil : config[:bbar] || %w{ add edit apply delete }
+    end
     
-
-    # Uncomment to enable a menu duplicating the actions
-    # def js_menus
-    #   [{:text => "config.dataClassName".l, :menu => "config.actions".l}]
-    # end
+    include ConfigurationTool # it will load aggregation with name :properties into a modal window
+    
+    protected
+    
+    def available_permissions
+      %w(read update create delete)
+    end
     
-    include PropertiesTool # it will load aggregation with name :properties into a modal window
   end
 end

data/lib/netzke/grid_panel_extras/interface.rb

@@ -140,6 +140,7 @@ module Netzke
         output_array
       end
   
+      # TODO: document me!
       def convert_filters(column_filter)
         res = {}
         column_filter.each_pair do |k,v|

data/lib/netzke/grid_panel_extras/javascripts/{check_column.js → check-column.js}

@@ -10,7 +10,7 @@ Ext.grid.CheckColumn = function(config){
 Ext.grid.CheckColumn.prototype ={
     init : function(grid){
         this.grid = grid;
-		if (this.disabled) return; // SK
+		if (this.disabled) {return;} // SK
         this.grid.on('render', function(){
             var view = this.grid.getView();
             view.mainBody.on('mousedown', this.onMouseDown, this);

data/lib/netzke/grid_panel_extras/js_builder.rb

@@ -18,23 +18,13 @@ module Netzke
           :rows_per_page => persistent_config["rows_per_page"] ||= config[:ext_config][:rows_per_page]
         })
       end
-  
+      
       module ClassMethods
 
         def js_base_class 
           'Ext.grid.EditorGridPanel'
         end
 
-        def js_bbar
-          <<-JS.l
-          (config.rowsPerPage) ? new Ext.PagingToolbar({
-            pageSize:config.rowsPerPage, 
-            items:config.actions, 
-            store:ds, 
-            emptyMsg:'Empty'}) : config.actions
-          JS
-        end
-
         def js_default_config
           super.merge({
             :store            => "ds".l,
@@ -43,9 +33,8 @@ module Netzke
             :auto_scroll      => true,
             :click_to_edit    => 2,
             :track_mouse_over => true,
-            # :bbar           => "config.actions".l,
-            :bbar             => js_bbar,
             :plugins          => "plugins".l,
+            :load_mask        => true,
       
             #custom configs
             :auto_load_data   => true
@@ -55,9 +44,9 @@ module Netzke
         def js_before_constructor
           <<-JS
           var plugins = [];
-          if (!config.columns) this.feedback('No columns defined for grid '+config.id);
+          if (!config.columns) {this.feedback('No columns defined for grid '+config.id);}
           this.recordConfig = [];
-          Ext.each(config.columns, function(column){this.recordConfig.push({name:column.name})}, this);
+          Ext.each(config.columns, function(column){this.recordConfig.push({name:column.name});}, this);
           this.Row = Ext.data.Record.create(this.recordConfig);
 
           var ds = new Ext.data.Store({
@@ -77,7 +66,7 @@ module Netzke
               extConfig = Ext.decode(c.extConfig);
             }
             catch(err){
-              extConfig = {}
+              extConfig = {};
             }
             delete(c.extConfig);
         
@@ -105,24 +94,30 @@ module Netzke
                 editor    : editor,
                 renderer  : renderer,
                 sortable  : true
-              }, extConfig))
+              }, extConfig));
             }
 
           }, this);
 
           var cm = new Ext.grid.ColumnModel(this.cmConfig);
     
-          this.addEvents("refresh");
+          // this.addEvents("refresh");
     
           // Filters
           if (config.enableColumnFilters) {
-            var filters = []
+            var filters = [];
             Ext.each(config.columns, function(c){
-              filters.push({type:Ext.netzke.filterMap[c.editor], dataIndex:c.name})
-            })
+              filters.push({type:Ext.netzke.filterMap[c.editor], dataIndex:c.name});
+            });
             var gridFilters = new Ext.grid.GridFilters({filters:filters});
             plugins.push(gridFilters);
           }
+          
+          config.bbar = (config.rowsPerPage) ? new Ext.PagingToolbar({
+            pageSize:config.rowsPerPage, 
+            items:["-", config.bbar], 
+            store:ds, 
+            emptyMsg:'Empty'}) : config.bbar
     
           JS
         end
@@ -140,8 +135,8 @@ module Netzke
               function(){
                 // auto-load
                 if (this.initialConfig.autoLoadData) {
-                  // if we have a paging toolbar, load the first page, otherwise
-                  if (this.getBottomToolbar().changePage) this.getBottomToolbar().changePage(0); else this.store.load();
+                  // if we have a paging toolbar, load the first page
+                  if (this.getBottomToolbar().changePage) {this.getBottomToolbar().changePage(0);} else {this.store.load();}
                 }
               }
             JS
@@ -149,12 +144,12 @@ module Netzke
             :load_exception_handler => <<-JS.l,
             function(proxy, options, response, error){
               if (response.status == 200 && (responseObject = Ext.decode(response.responseText)) && responseObject.flash){
-                this.feedback(responseObject.flash)
+                this.feedback(responseObject.flash);
               } else {
                 if (error){
                   this.feedback(error.message);
                 } else {
-                  this.feedback(response.statusText)
+                  this.feedback(response.statusText);
                 }  
               }
             }        
@@ -182,7 +177,7 @@ module Netzke
               function(){
                 var row = this.getSelectionModel().getSelected();
                 if (row){
-                  this.tryStartEditing(this.store.indexOf(row))
+                  this.tryStartEditing(this.store.indexOf(row));
                 }
               }
             JS
@@ -190,7 +185,7 @@ module Netzke
             # try editing the first editable (not hidden, not read-only) sell
             :try_start_editing => <<-JS.l,
               function(row){
-                if (row == null) return;
+                if (row === null) {return;}
                 var editableColumns = this.getColumnModel().getColumnsBy(function(columnConfig, index){
                   return !columnConfig.hidden && !!columnConfig.editor;
                 });
@@ -207,7 +202,7 @@ module Netzke
                 if (this.getSelectionModel().hasSelection()){
                   Ext.Msg.confirm('Confirm', 'Are you sure?', function(btn){
                     if (btn == 'yes') {
-                      var records = []
+                      var records = [];
                       this.getSelectionModel().each(function(r){
                         records.push(r.get('id'));
                       }, this);
@@ -226,7 +221,7 @@ module Netzke
                 }
               }
             JS
-            :submit => <<-JS.l,
+            :apply => <<-JS.l,
               function(){
 
                 var newRecords = [];
@@ -261,15 +256,15 @@ module Netzke
                       var m = Ext.decode(response.responseText);
                       if (m.success) {
                         // commit those rows that have successfully been updated/created
-                        var modRecords = [].concat(this.store.getModifiedRecords()) // there must be a better way to clone an array...
+                        var modRecords = [].concat(this.store.getModifiedRecords()); // there must be a better way to clone an array...
                         Ext.each(modRecords, function(r){
-                          var idsToSearch = r.is_new ? m.modRecordIds.create : m.modRecordIds.update
-                          if (idsToSearch.indexOf(r.id) >= 0) r.commit();
-                        })
+                          var idsToSearch = r.is_new ? m.modRecordIds.create : m.modRecordIds.update;
+                          if (idsToSearch.indexOf(r.id) >= 0) {r.commit();}
+                        });
 
                         // reload the grid only when there were no errors
                         // (we need to reload because of filtering, sorting, etc)
-                        if (this.store.getModifiedRecords().length == 0){
+                        if (this.store.getModifiedRecords().length === 0){
                           this.store.reload();
                         }
 
@@ -288,9 +283,9 @@ module Netzke
               }
             JS
    
-            :refresh_click => <<-JS.l,
+            :refresh => <<-JS.l,
               function() {
-                if (this.fireEvent('refresh', this) !== false) this.store.reload();
+                if (this.fireEvent('refresh', this) !== false) {this.store.reload();}
               }
             JS
       
@@ -302,7 +297,7 @@ module Netzke
                     index:index,
                     size:size
                   }
-                })
+                });
               }
             JS
       
@@ -314,7 +309,7 @@ module Netzke
                     old_index:oldIndex,
                     new_index:newIndex
                   }
-                })
+                });
               }
             JS