erp_app 3.1.1 → 3.1.2

data/lib/active_ext/ext_helpers/table_builder.rb

@@ -1,77 +1,77 @@
 module ActiveExt
-module ExtHelpers
-module TableBuilder
+  module ExtHelpers
+    module TableBuilder
 
-  def self.generate_columns_and_fields(core)
-    columns     = self.build_columns(core)
-    fields      = self.build_fields(core)
-    validations = self.build_validations(core)
+      def self.generate_columns_and_fields(core)
+        columns = self.build_columns(core)
+        fields = self.build_fields(core)
+        validations = self.build_validations(core)
 
-    return columns, fields, validations
-  end
+        return columns, fields, validations
+      end
 
-  private
+      private
 
-  def self.build_columns(core)
-    columns = []
+      def self.build_columns(core)
+        columns = []
 
-    #add id column if showing it
-    if core.options[:show_id]
-      columns << ActiveExt::ExtHelpers::ColumnBuilder.build_column(core.columns[:id])
-    end
-    
-    #build ext columns
-    core.columns.each do |column|
-      next if column.name.to_s =~ /(^id|created_at|updated_at)$/ || core.columns.exclude_column?(column.name)
-      columns << ActiveExt::ExtHelpers::ColumnBuilder.build_column(column)
-    end
-    
-    #add timestamp columns if showing them
-    if core.options[:show_timestamps]
-      columns << ActiveExt::ExtHelpers::ColumnBuilder.build_column(core.columns[:created_at])
-      columns << ActiveExt::ExtHelpers::ColumnBuilder.build_column(core.columns[:updated_at])
-    end
-    
-    columns
-  end
+        #add id column if showing it
+        if core.options[:show_id]
+          columns << ActiveExt::ExtHelpers::ColumnBuilder.build_column(core.columns[:id])
+        end
 
-  def self.build_fields(core)
-    fields = []
+        #build ext columns
+        core.columns.each do |column|
+          next if column.name.to_s =~ /(^id|created_at|updated_at)$/ || core.columns.exclude_column?(column.name)
+          columns << ActiveExt::ExtHelpers::ColumnBuilder.build_column(column)
+        end
 
-    fields << {:name => 'id', :type => 'number'}
+        #add timestamp columns if showing them
+        if core.options[:show_timestamps]
+          columns << ActiveExt::ExtHelpers::ColumnBuilder.build_column(core.columns[:created_at])
+          columns << ActiveExt::ExtHelpers::ColumnBuilder.build_column(core.columns[:updated_at])
+        end
 
-    #build ext fields
-    core.columns.each do |column|
-      next if column.name.to_s =~ /(^created_at|updated_at)$/  || core.columns.exclude_column?(column.name)
-      if column.association.nil?
-        fields << {:name => column.name, :allowBlank => !column.options[:required]}
+        columns
       end
-    end
 
-    if core.options[:show_timestamps]
-      fields << {:name => 'created_at', :type => 'date'}
-      fields << {:name => 'updated_at', :type => 'date'}
-    end
+      def self.build_fields(core)
+        fields = []
 
-    fields
-  end
+        fields << {:name => 'id', :type => 'number'}
 
-  def self.build_validations(core)
-    validations = []
+        #build ext fields
+        core.columns.each do |column|
+          next if column.name.to_s =~ /(^created_at|updated_at)$/ || core.columns.exclude_column?(column.name)
+          if column.association.nil?
+            fields << {:name => column.name, :allowBlank => !column.options[:required]}
+          end
+        end
 
-    #build ext fields
-    core.columns.each do |column|
-      next if column.name.to_s =~ /(^created_at|updated_at)$/  || core.columns.exclude_column?(column.name)
-      if column.association.nil?
-        if column.options[:required]
-          validations << {:type => 'presence', :field => column.name}
+        if core.options[:show_timestamps]
+          fields << {:name => 'created_at', :type => 'date'}
+          fields << {:name => 'updated_at', :type => 'date'}
         end
+
+        fields
       end
-    end
 
-    validations
-  end
+      def self.build_validations(core)
+        validations = []
 
-end
-end
+        #build ext fields
+        core.columns.each do |column|
+          next if column.name.to_s =~ /(^created_at|updated_at)$/ || core.columns.exclude_column?(column.name)
+          if column.association.nil?
+            if column.options[:required]
+              validations << {:type => 'presence', :field => column.name}
+            end
+          end
+        end
+
+        validations
+      end
+
+    end
+  end
 end

data/lib/erp_app/engine.rb

@@ -4,7 +4,7 @@ module ErpApp
   class Engine < Rails::Engine
     isolate_namespace ErpApp
 
-    Mime::Type.register "json/tree", :tree
+    Mime::Type.register "tree", :tree
 
     config.erp_app = ErpApp::Config
 

data/lib/erp_app/extensions/railties/action_view/helpers/extjs_helper.rb

@@ -29,8 +29,11 @@ module ErpApp
               output += raw "Compass.ErpApp.Utility.JsLoader.load([
                     '/javascripts/erp_app/shared/dynamic_editable_grid.js',
                     '/javascripts/erp_app/shared/dynamic_editable_grid_loader_panel.js'],
-                    function(){
-                      Ext.create('Compass.ErpApp.Shared.DynamicEditableGridLoaderPanel', #{options.to_json} );
+                     function(){
+                      var task = Ext.create('Ext.util.DelayedTask', function () {
+                                    Ext.create('Compass.ErpApp.Shared.DynamicEditableGridLoaderPanel', #{options.to_json} );
+                                 });
+                      task.delay(200);
                     });"
               output += raw '</script>'
 

data/lib/erp_app/extensions/railties/action_view/helpers/include_helper.rb

@@ -6,11 +6,11 @@ module ErpApp
           module IncludeHelper
 
             def static_javascript_include_tag(*srcs)
-              raw srcs.flatten.map{|src| "<script type=\"text/javascript\" src=\"/javascripts/#{src}\"></script>"}.join("")
+              raw srcs.flatten.map{|src| "<script type=\"text/javascript\" src=\"/javascripts/#{src.include?('.js') ? src : "#{src}.js"}\"></script>"}.join("")
             end
       
             def static_stylesheet_link_tag(*srcs)
-              raw srcs.flatten.map{|src| "<link rel=\"stylesheet\" type=\"text/css\" href=\"/stylesheets/#{src}\" />"}.join("")
+              raw srcs.flatten.map{|src| "<link rel=\"stylesheet\" type=\"text/css\" href=\"/stylesheets/#{src.include?('.css') ? src : "#{src}.css"}\" />"}.join("")
             end
       
             def include_extjs(opt={})
@@ -111,7 +111,7 @@ module ErpApp
             end
       
             def include_compass_ae_instance_about
-              compass_ae_instance = CompassAeInstance.first
+              compass_ae_instance = CompassAeInstance.find_by_internal_identifier('base')
               json_hash = {
                 :version => compass_ae_instance.version,
                 :installedAt => compass_ae_instance.created_at.strftime("%B %d, %Y at %I:%M%p"),
@@ -132,7 +132,7 @@ module ErpApp
             def setSessionTimeout(warn_milli_seconds=((ErpApp::Config.session_warn_after*60)*1000),
                                   redirect_milli_seconds=((ErpApp::Config.session_redirect_after*60)*1000),
                                   redirect_to='/session/sign_out')
-              raw "<script type='text/javascript'>Compass.ErpApp.Utility.SessionTimeout.setupSessionTimeout(#{warn_milli_seconds}, #{redirect_milli_seconds}, '#{redirect_to}') </script>" unless current_user === false
+              raw "<script type='text/javascript'>Compass.ErpApp.Utility.SessionTimeout.setupSessionTimeout(#{warn_milli_seconds}, #{redirect_milli_seconds}, '#{redirect_to}') </script>" if current_user
             end
 
             def load_shared_application_resources(resource_type)

data/lib/erp_app/version.rb

@@ -2,7 +2,7 @@ module ErpApp
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/lib/erp_app/widgets/javascript_loader.rb

@@ -3,7 +3,7 @@ module ErpApp
     class JavascriptLoader
 
       def self.glob_javascript
-        files = Rails.application.config.erp_app.widgets.collect{|widget|Dir.glob(File.join(widget[:path],"javascript/*.js"))}.flatten
+        files = Rails.application.config.erp_app.widgets.collect{|widget|Dir.glob(File.join(widget[:path],"javascript/*.js"))}.flatten.sort{|file| file <=> file}
         
         "<script type='text/javascript'>#{Uglifier.compile(files.collect{|file| IO.read(file)}.join(''))}</script>"
       end

data/lib/erp_app/widgets/loader.rb

@@ -3,17 +3,16 @@ module ErpApp
     class Loader
       class << self
         def load_compass_ae_widgets(config, engine)
-          config.send(ErpBaseErpSvcs.determine_callback) do
+          ErpBaseErpSvcs.setup_compass_ae_callback(config, engine) do |engine|
             ::ErpApp::Widgets::Loader.require_widgets_and_helpers(engine.root)
             ::ErpApp::Widgets::Loader.load_widget_extensions(engine)
           end
-
         end
 
         def load_root_widgets(config)
-          config.send(ErpBaseErpSvcs.determine_callback) do
-            ::ErpApp::Widgets::Loader.require_widgets_and_helpers(Rails.root.to_s)
-          end
+           ErpBaseErpSvcs.setup_compass_ae_callback(config, nil) do |engine|
+             ::ErpApp::Widgets::Loader.require_widgets_and_helpers(Rails.root.to_s)
+           end
         end
 
         def require_widgets_and_helpers(path)
@@ -129,4 +128,4 @@ module ErpApp
       end#self
     end#Loader
   end#Widgets
-end#ErpApp
+end#ErpApp

data/lib/generators/compass_ae_mobile/USAGE

@@ -0,0 +1,9 @@
+Description:
+  Used to create a Sencha Mobile application linked to CompassAE for mobile 
+  optimized web application
+
+Example:
+    rails g compass_ae_mobile [application_name] [sencha_touch_sdk_path]
+
+    This will create:
+       1. Sencha Touch application in /public/javascripts/[application_name]

data/lib/generators/compass_ae_mobile/compass_ae_mobile_generator.rb

@@ -0,0 +1,35 @@
+class CompassAeMobileGenerator < Rails::Generators::NamedBase
+  source_root File.expand_path('../templates', __FILE__)
+  argument :sdk_path, :type => :string
+  
+  def generate_sencha_touch_application
+    javascripts_path = File.join(Rails.root, 'public', 'javascripts')
+    application_path = File.join(javascripts_path, class_name)
+    
+    empty_directory(javascripts_path)
+    run "sencha -sdk #{@sdk_path} generate app #{class_name} #{application_path}"
+    
+    %w{app.json build.xml index.html packager.json resources}.each do |file|
+      remove_file(File.join(application_path, file))
+    end
+    
+    gsub_file File.join(application_path, 'app.js'), %r[^//<debug>([\s\S])+//</debug>], "Ext.Loader.setPath({'#{class_name}': 'javascripts/#{class_name}/app'});"
+    
+    #replace Main.js
+    remove_file remove_file(File.join(application_path, 'app', 'view', 'Main.js'))
+    template "javascripts/main_template.erb", File.join(application_path, 'app', 'view', 'Main.js')
+  end
+  
+  def generate_compass_ae_files
+    #controller
+    template "controllers/controller_template.erb", File.join("app/controllers","#{file_name}_controller.rb")
+    
+    #view
+    copy_file "views/view_template.erb", File.join("app/views/#{file_name}","index.html.erb")
+    gsub_file File.join("app/views/#{file_name}","index.html.erb"), /CLASS_NAME_PLACE_HOLDER/, class_name
+    
+    #route
+    route "match '/#{file_name}' => '#{file_name}#index'"
+  end
+  
+end

data/lib/generators/compass_ae_mobile/templates/controllers/controller_template.erb

@@ -0,0 +1,4 @@
+class <%= class_name %>Controller < ApplicationController
+  def index
+  end
+end

data/lib/generators/compass_ae_mobile/templates/javascripts/main_template.erb

@@ -0,0 +1,29 @@
+Ext.define('<%=class_name%>.view.Main', {
+    extend: 'Ext.tab.Panel',
+    xtype: 'main',
+    config: {
+        tabBarPosition: 'bottom',
+
+        items: [
+            {
+                title: 'Welcome',
+                iconCls: 'home',
+
+                styleHtmlContent: true,
+                scrollable: true,
+
+                items: {
+                    docked: 'top',
+                    xtype: 'titlebar',
+                    title: 'Welcome to <%=class_name%>'
+                },
+
+                html: [
+                    "You've just generated a new Sencha Touch 2 application within the CompassAE framework. What you're looking at right now is the ",
+                    "contents of <a target='_blank' href=\"javascripts/<%=class_name%>/app/view/Main.js\">public/javascripts/<%=class_name%>/app/view/Main.js</a> - edit that file ",
+                    "and refresh to change what's rendered here."
+                ].join("")
+            }
+        ]
+    }
+});

data/lib/generators/compass_ae_mobile/templates/views/view_template.erb

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/html">
+<head>
+  <%= csrf_meta_tag %>
+  <title>CLASS_NAME_PLACE_HOLDER</title>
+  <%= include_sencha_touch :theme => false, :debug => (Rails.env != 'production') %>
+
+  <%= static_stylesheet_link_tag('sencha_touch/resources/css/sencha-touch.css') %>
+  <%= static_stylesheet_link_tag('sencha_touch/resources/css/apple.css') %>
+
+  <%= static_javascript_include_tag('erp_app/utility.js') %>
+  <%= static_javascript_include_tag('erp_app/mobile/mobile_base.js') %>
+
+  <%= add_authenticity_token_to_extjs %>
+  
+  <%= static_javascript_include_tag('CLASS_NAME_PLACE_HOLDER/app.js') %>
+</head>
+<body>
+    <div id="appLoadingIndicator">
+      <div></div>
+      <div></div>
+      <div></div>
+    </div>
+</body>
+</html>

data/public/javascripts/erp_app/desktop/applications/scaffold/models_tree_panel.js

@@ -9,59 +9,20 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Scaffold.ModelsTree",{
         this.findParentByType('statuswindow').clearStatus();
     },
 
-    addModel : function(){
-        var self = this;
-        Ext.MessageBox.prompt('Add Model', 'Model name:', function(btn, text){
-            if(btn == 'ok'){
-                self.setWindowStatus('Adding model to scaffold');
-                Ext.Ajax.request({
-                    url:'/erp_app/desktop/scaffold/create_model',
-                    method: 'POST',
-                    params:{
-                        name:text
-                    },
-                    success: function(response) {
-                        self.clearWindowStatus();
-                        var obj =  Ext.decode(response.responseText);
-                        if(obj.success){
-                            Ext.MessageBox.confirm('Confirm', 'Page must reload for changes to take affect. Reload now?', function(btn){
-                                if(btn == 'no'){
-                                    return false;
-                                }
-                                else{
-                                    window.location.reload();
-                                }
-                            });
-                        }
-                        else{
-                            Ext.Msg.alert("Error", obj.msg);
-                        }
-                    },
-                    failure: function(response) {
-                        self.clearWindowStatus();
-                        var obj = Ext.decode(response.responseText);
-                        if(!Compass.ErpApp.Utility.isBlank(obj) && !Compass.ErpApp.Utility.isBlank(obj.msg)){
-                            Ext.Msg.alert("Error", obj.msg);
-                        }
-                        else{
-                            Ext.Msg.alert("Error", "Error adding model");
-                        }
-                    }
-                });
-            }
-        });
-    },
-
     constructor : function(config) {
         var self = this;
 
         var store = Ext.create('Ext.data.TreeStore', {
             proxy: {
                 type: 'ajax',
-                url: '/erp_app/desktop/scaffold/get_active_ext_models'
+                url: '/erp_app/desktop/scaffold/get_models.tree',
+                reader:{
+                    type:'json',
+                    root:'names'
+                }
             },
             root: {
-                text: 'Models',
+                text: 'CompassAE Models',
                 draggable:false
             },
             fields:[
@@ -77,19 +38,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Scaffold.ModelsTree",{
             animate:false,
             region:'west',
             autoScroll:true,
-            tbar:{
-                items:[
-                {
-                    text:'Add Model',
-                    iconCls:'icon-add',
-                    scope:this,
-                    handler:function(){
-                        this.addModel();
-                    }
-                }
-                ]
-            },
-            enableDD:true,
+            enableDD:false,
             containerScroll: true,
             border: false,
             frame:true,
@@ -97,12 +46,15 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Scaffold.ModelsTree",{
             height: 300,
             listeners:{
                 'itemclick':function(view, record){
-                    if(record.data.leaf){
+                    if(!record.data.leaf){
                         self.initialConfig.scaffold.loadModel(record.data.model);
                     }
                 },
                 'contextmenu':function(node, e){
                     e.stopEvent();
+                },
+                render:function(){
+                    this.getRootNode().expand();
                 }
             }
         }, config);

data/public/javascripts/erp_app/desktop/applications/scaffold/module.js

@@ -1,59 +1,60 @@
-Ext.define("Compass.ErpApp.Desktop.Applications.Scaffold",{
+Ext.define("Compass.ErpApp.Desktop.Applications.Scaffold", {
     extend:"Ext.ux.desktop.Module",
     id:'scaffold-win',
-    loadModel : function(modelName){
-        //check if we are already showing this model
-        var tab = null;
-        var items = this.modelsTabPanel.items;
-        Ext.each(items.items, function(item){
-            if(item.xtype == modelName + '_activeextgrid'){
-                tab = item;
-            }
-        });
-
-        if(!Compass.ErpApp.Utility.isBlank(tab)){
-            this.modelsTabPanel.setActiveTab(tab);
-        }
-        else{
-            this.modelsTabPanel.add({
-                xtype:modelName + '_activeextgrid',
-                closable:true
+    loadModel:function (modelName) {
+        var dynamicGrid = this.modelsTabPanel.down('#'+modelName);
+        if(Ext.isEmpty(dynamicGrid)){
+            dynamicGrid = Ext.create('Compass.ErpApp.Shared.DynamicEditableGridLoaderPanel', {
+                closable:true,
+                itemId:modelName,
+                editable:true,
+                title:modelName,
+                setupUrl:'/erp_app/desktop/scaffold/setup/' + modelName,
+                dataUrl:'/erp_app/desktop/scaffold/data/' + modelName,
+                page:true,
+                pageSize:30,
+                displayMsg:'Displaying {0} - {1} of {2}',
+                emptyMsg:'Empty'
             });
-            this.modelsTabPanel.setActiveTab(this.modelsTabPanel.items.length - 1);
+            this.modelsTabPanel.add(dynamicGrid);
         }
+
+        this.modelsTabPanel.setActiveTab(dynamicGrid);
     },
 
-    init : function(){
+    init:function () {
         this.launcher = {
-            text: 'Scaffold',
+            text:'Scaffold',
             iconCls:'icon-data',
-            handler : this.createWindow,
-            scope: this
+            handler:this.createWindow,
+            scope:this
         }
     },
-    
-    createWindow : function(){
+
+    createWindow:function () {
         var desktop = this.app.getDesktop();
         var win = desktop.getWindow('scaffold');
-        if(!win){
-            this.modelsTabPanel = new Ext.TabPanel({
-                region:'center'
-            });
+        if (!win) {
+
+            this.modelsTabPanel = Ext.create('Ext.tab.Panel',{region:'center',items:[]});
 
             win = desktop.createWindow({
-                id: 'scaffold',
+                id:'scaffold',
                 title:'Scaffold',
                 width:1000,
                 height:550,
-                iconCls: 'icon-data',
+                iconCls:'icon-data',
                 shim:false,
                 animCollapse:false,
                 constrainHeader:true,
-                layout: 'border',
-                items:[{
-                    xtype:'scaffold_modelstreepanel',
-                    scaffold:this
-                },this.modelsTabPanel]
+                layout:'border',
+                items:[
+                    {
+                        xtype:'scaffold_modelstreepanel',
+                        scaffold:this
+                    },
+                    this.modelsTabPanel
+                ]
             });
         }
         win.show();

data/public/javascripts/erp_app/shared/Ext.ux.CheckColumn.js

@@ -0,0 +1,115 @@
+/**
+ * A Header subclass which renders a checkbox in each column cell which toggles the truthiness of the associated data field on click.
+ *
+ * Example usage:
+ *
+ *    // create the grid
+ *    var grid = Ext.create('Ext.grid.Panel', {
+ *        ...
+ *        columns: [{
+ *           text: 'Foo',
+ *           ...
+ *        },{
+ *           xtype: 'checkcolumn',
+ *           text: 'Indoor?',
+ *           dataIndex: 'indoor',
+ *           width: 55
+ *        }]
+ *        ...
+ *    });
+ *
+ * In addition to toggling a Boolean value within the record data, this
+ * class adds or removes a css class <tt>'x-grid-checked'</tt> on the td
+ * based on whether or not it is checked to alter the background image used
+ * for a column.
+ */
+Ext.define('Ext.ux.CheckColumn', {
+    extend: 'Ext.grid.column.Column',
+    alias: 'widget.checkcolumn',
+
+    /**
+     * @cfg {Boolean} [stopSelection=true]
+     * Prevent grid selection upon mousedown.
+     */
+    stopSelection: true,
+
+    tdCls: Ext.baseCSSPrefix + 'grid-cell-checkcolumn',
+
+    constructor: function() {
+        this.addEvents(
+            /**
+             * @event beforecheckchange
+             * Fires when before checked state of a row changes.
+             * The change may be vetoed by returning `false` from a listener.
+             * @param {Ext.ux.CheckColumn} this CheckColumn
+             * @param {Number} rowIndex The row index
+             * @param {Boolean} checked True if the box is to be checked
+             */
+            'beforecheckchange',
+            /**
+             * @event checkchange
+             * Fires when the checked state of a row changes
+             * @param {Ext.ux.CheckColumn} this CheckColumn
+             * @param {Number} rowIndex The row index
+             * @param {Boolean} checked True if the box is now checked
+             */
+            'checkchange'
+        );
+        this.callParent(arguments);
+    },
+
+    /**
+     * @private
+     * Process and refire events routed from the GridView's processEvent method.
+     */
+    processEvent: function(type, view, cell, recordIndex, cellIndex, e, record, row) {
+        var me = this,
+            key = type === 'keydown' && e.getKey(),
+            mousedown = type == 'mousedown';
+
+        if (mousedown || (key == e.ENTER || key == e.SPACE)) {
+            var dataIndex = me.dataIndex,
+                checked = !record.get(dataIndex);
+
+            // Allow apps to hook beforecheckchange
+            if (me.fireEvent('beforecheckchange', me, recordIndex, checked) !== false) {
+                record.set(dataIndex, checked);
+                me.fireEvent('checkchange', me, recordIndex, checked);
+
+                // Mousedown on the now nonexistent cell causes the view to blur, so stop it continuing.
+                if (mousedown) {
+                    e.stopEvent();
+                }
+
+                // Selection will not proceed after this because of the DOM update caused by the record modification
+                // Invoke the SelectionModel unless configured not to do so
+                if (!me.stopSelection) {
+                    view.selModel.selectByPosition({
+                        row: recordIndex,
+                        column: cellIndex
+                    });
+                }
+
+                // Prevent the view from propagating the event to the selection model - we have done that job.
+                return false;
+            } else {
+                // Prevent the view from propagating the event to the selection model if configured to do so.
+                return !me.stopSelection;
+            }
+        } else {
+            return me.callParent(arguments);
+        }
+    },
+
+    // Note: class names are not placed on the prototype bc renderer scope
+    // is not in the header.
+    renderer : function(value){
+        var cssPrefix = Ext.baseCSSPrefix,
+            cls = [cssPrefix + 'grid-checkheader'];
+
+        if (value) {
+            cls.push(cssPrefix + 'grid-checkheader-checked');
+        }
+        return '<div class="' + cls.join(' ') + '">&#160;</div>';
+    }
+});