erp_app 4.0.0 → 4.2.0

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

@@ -8,13 +8,13 @@ module ErpApp
             def include_highslide(options = {})
               raw case options[:version].to_s.downcase
                     when 'full'
-                      static_javascript_include_tag("erp_app/highslide/highslide/highslide-full.js")
+                      static_javascript_include_tag("highslide/highslide/highslide-full.js")
                     when 'gallery'
-                      static_javascript_include_tag("erp_app/highslide/highslide/highslide-with-gallery.js")
+                      static_javascript_include_tag("highslide/highslide/highslide-with-gallery.js")
                     when 'html'
-                      static_javascript_include_tag("erp_app/highslide/highslide/highslide-with-html.js")
+                      static_javascript_include_tag("highslide/highslide/highslide-with-html.js")
                     else
-                      static_javascript_include_tag("erp_app/highslide/highslide/highslide.js")
+                      static_javascript_include_tag("highslide/highslide/highslide.js")
                   end
             end
 
@@ -22,29 +22,29 @@ module ErpApp
               # only setup user if a current_user is logged in
               if current_user
                 current_user = {
-                    :username => user.username,
-                    :lastloginAt => user.last_login_at,
-                    :lastActivityAt => user.last_activity_at,
-                    :failedLoginCount => user.failed_logins_count,
-                    :email => user.email,
-                    :roles => user.all_roles.collect { |role| role.internal_identifier },
-                    :capabilities => user.class_capabilities_to_hash,
-                    :id => user.id,
-                    :partyId => user.party.id,
-                    :description => user.party.to_s
+                    username: user.username,
+                    lastloginAt: user.last_login_at,
+                    lastActivityAt: user.last_activity_at,
+                    failedLoginCount: user.failed_logins_count,
+                    email: user.email,
+                    roles: user.all_roles.collect { |role| role.internal_identifier },
+                    capabilities: user.class_capabilities_to_hash,
+                    id: user.id,
+                    partyId: user.party.id,
+                    dbaOrganizationId: user.party.dba_organization.id,
+                    description: user.party.to_s
                 }
-                js_string = static_javascript_include_tag('erp_app/authentication/compass_user.js')
+                js_string = javascript_include_tag('erp_app/authentication/compass_user.js')
                 js_string << (raw "<script type='text/javascript'>var currentUser = new ErpApp.CompassAccessNegotiator.CompassUser(#{current_user.to_json});</script>")
                 js_string
               end
             end
 
             def include_code_mirror_library(theme='vibrant-ink')
-              resources = static_javascript_include_tag("erp_app/codemirror/lib/codemirror.js")
-              resources << static_javascript_include_tag("erp_app/codemirror_highlight.js")
-              resources << (raw "<link rel=\"stylesheet\" type=\"text/css\" href=\"/javascripts/erp_app/codemirror/lib/codemirror.css\" />")
-              resources << (raw "<link rel=\"stylesheet\" type=\"text/css\" href=\"/javascripts/erp_app/codemirror/theme/"+theme+".css\" />")
-              resources
+              buffer = javascript_include_tag("codemirror_compassae")
+              buffer << stylesheet_link_tag("codemirror_compassae")
+
+              buffer
             end
 
             def include_compass_ae_instance
@@ -60,8 +60,8 @@ module ErpApp
             end
 
             def set_session_timeout(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')
+                                    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>" if current_user
             end
 
@@ -73,13 +73,20 @@ module ErpApp
             alias_method :setSessionTimeout, :set_session_timeout
 
             def load_shared_application_resources(resource_type)
-              resource_type = resource_type.to_sym
-              case resource_type
-                when :javascripts
-                  raw static_javascript_include_tag(ErpApp::ApplicationResourceLoader::SharedLoader.new.locate_shared_files(resource_type))
-                when :stylesheets
-                  raw static_stylesheet_link_tag(ErpApp::ApplicationResourceLoader::SharedLoader.new.locate_shared_files(resource_type))
-              end
+              raw case resource_type.to_sym
+                    when :javascripts
+                      sources = ErpApp::Config.shared_js_assets.collect { |path| javascript_include_tag(path) }.join(' ')
+
+                      # add the root apps shared assets if they exist
+                      if File.exists? File.join(Rails.root, 'app/assets/javascripts/erp_app/shared/app.js')
+                        sources += javascript_include_tag('erp_app/shared/app.js')
+                      end
+
+                      sources
+
+                    when :stylesheets
+                      ErpApp::Config.shared_css_assets.collect { |path| stylesheet_link_tag(path) }.join(' ')
+                  end
             end
 
           end #IncludeHelper
@@ -87,4 +94,4 @@ module ErpApp
       end #ActionView
     end #Railties
   end #Extensions
-end #ErpApp
+end #ErpApp

data/lib/erp_app/version.rb

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

data/lib/erp_app/widgets/base.rb

@@ -23,7 +23,8 @@ module ErpApp
                           model_name use_dynamic_form authenticity_token is_html_form commit utf8}
 
       delegate :redirect_to, :config, :params, :session, :request, :logger, :logged_in?, :current_user, :login,
-               :flash, :update_div_id, :update_html, :current_theme_paths, :request, :to => :proxy_controller
+               :flash, :update_div_id, :update_html, :current_theme_paths, :request, :cookies,
+               :protect_against_forgery?, :form_authenticity_token, :to => :proxy_controller
 
       attr_reader   :state_name
       attr_accessor :proxy_controller, :name, :div_id,:html, :view, :uuid, :widget_params
@@ -100,7 +101,8 @@ module ErpApp
             process_opts_for(opts, view)
             js = render_to_string(opts).html_safe
           end
-          return {:json => {:htmlId => update_opts[:id], :html => js}}
+          extra_params = update_opts[:extraParams] || {}
+          return {:json => {:htmlId => update_opts[:id], :html => js, :success => true, :extraParams => extra_params}}
         elsif (opts.keys & [:text, :inline, :file]).blank?
           process_opts_for(opts, view)
           return render_to_string(opts).html_safe # ActionView::Template::Text doesn't do that for us.
@@ -116,7 +118,7 @@ module ErpApp
       def merge_params
         stored_widget_params = session[:widgets][self.uuid]
         unless stored_widget_params.nil?
-          self.params.merge!(stored_widget_params)
+          self.params.merge! stored_widget_params.merge self.params
         end
       end
 
@@ -179,4 +181,4 @@ module ErpApp
 
     end#Base
   end#Widgets
-end#ErpApp
+end#ErpApp

data/lib/erp_app/widgets/loader.rb

@@ -61,7 +61,7 @@ module ErpApp
             #add any additional view paths to widgets
             if File.directory?(File.join(widgets_path,widget_name,'views'))
               view_path = File.join(widgets_path,widget_name,'views')
-              widget_hash[:view_paths].unshift(view_path)
+              widget_hash[:view_paths].push(view_path)
               #get all view files for theme generation
               get_widget_view_files(widget_hash, view_path)
             end

data/lib/erp_app/widgets/railties/action_view/helpers/widget_helper.rb

@@ -4,37 +4,37 @@ module ErpApp
       module ActionView
         module Helpers
           module WidgetHelper
-            
+
             def render_widget(name, opts={})
               action = opts[:action] || :index
               params = opts[:params].nil? ? {} : opts[:params]
 
               uuid = Digest::SHA1.hexdigest(Time.now.to_s + rand(10000).to_s)
-              
+
               #render widget
               widget_obj = "::Widgets::#{name.to_s.camelize}::Base".constantize.new(self.controller, name.to_s, action.to_s, uuid, params, nil)
               result = widget_obj.process(action.to_s)
-              
+
               html = "<div id=\"#{uuid}\" class='compass_ae-widget'>"
               html << result
-              html << "</div>" 
+              html << "</div>"
               html << "<script type='text/javascript'>"
               html << "Compass.ErpApp.Widgets.LoadedWidgets.push({id:'#{uuid}',name:'#{name.to_s}',action:'#{action.to_s}',params:#{params.to_json}});"
               html << "</script>"
-              
+
               raw html
             end
 
-            def build_widget_url(action,id=nil,params={})
+            def build_widget_url(action, id=nil, params={})
               url = if id
-                "/erp_app/widgets/#{@name}/#{action}/#{@uuid}/#{id}"
-              else
-                "/erp_app/widgets/#{@name}/#{action}/#{@uuid}"
-              end
+                      "/erp_app/widgets/#{@name}/#{action}/#{@uuid}/#{id}"
+                    else
+                      "/erp_app/widgets/#{@name}/#{action}/#{@uuid}"
+                    end
 
               if params
                 url = "#{url}?"
-                params.each do |k,v|
+                params.each do |k, v|
                   url += "#{k.to_s}=#{v.to_s}&"
                 end
                 url = url[0...url.length - 1]
@@ -42,7 +42,7 @@ module ErpApp
 
               url
             end
-  
+
             def widget_result_id
               "#{@uuid}_result"
             end

data/lib/generators/admin_tool/USAGE

@@ -0,0 +1,23 @@
+Description:
+  Used to create stubs for a new Admin Tool within the Compass AE framework
+
+Example:
+    rails g admin_tool [name] [description] [icon-cls]
+
+    This will create:
+        1. A controller
+        2. Public folder structures
+
+           public/javascripts/erp_app/desktop/applications/[YOUR APP NAME]
+           public/stylesheets/erp_app/desktop/applications/[YOUR APP NAME]
+           public/images/erp_app/desktop/applications/[YOUR APP NAME]
+
+        3. A Javascript template
+        4. A data migration
+        5. Append to the routes file
+        
+        Run the migration with 
+        
+        rake db:migrate_data
+
+        and start adding functionality

data/lib/generators/admin_tool/admin_tool_generator.rb

@@ -0,0 +1,28 @@
+class AdminToolGenerator < Rails::Generators::NamedBase
+  source_root File.expand_path('../templates', __FILE__)
+  argument :description, :type => :string 
+  argument :icon, :type => :string 
+
+  def generate_desktop_application
+    # Controller
+    template "controllers/controller_template.erb", "app/controllers/erp_app/desktop/#{file_name}/base_controller.rb"
+
+    # make javascript
+    template "assets/javascripts/Module.js.erb", "app/assets/javascripts/erp_app/desktop/applications/#{file_name}/Module.js"
+
+    # make javascript manifest
+    template "assets/javascripts/app.js.erb", "app/assets/javascripts/erp_app/desktop/applications/#{file_name}/app.js"
+
+    # make css manifest
+    template "assets/stylesheets/app.css.erb", "app/assets/stylesheets/erp_app/desktop/applications/#{file_name}/app.css"
+
+    # make images folder
+    empty_directory "app/assets/images/erp_app/desktop/applications/#{file_name}"
+    
+    # add route
+    route "match '/erp_app/desktop/#{file_name}(/:action)' => \"erp_app/desktop/#{file_name}/base\""
+    
+    # migration
+    template "migrate/migration_template.erb", "db/data_migrations/#{RussellEdge::DataMigrator.next_migration_number(1)}_create_#{file_name}_desktop_application.rb"
+  end
+end

data/lib/generators/admin_tool/templates/INSTALL

@@ -0,0 +1,23 @@
+Description:
+  Used to create stubs for a new Admin Tool within the Compass AE framework
+
+Example:
+    rails g admin_tool [name] [description] [icon-cls]
+
+    This will create:
+        1. A controller
+        2. Public folder structures
+
+           public/javascripts/erp_app/desktop/applications/[YOUR APP NAME]
+           public/stylesheets/erp_app/desktop/applications/[YOUR APP NAME]
+           public/images/erp_app/desktop/applications/[YOUR APP NAME]
+
+        3. A Javascript template
+        4. A data migration
+        5. Append to the routes file
+        
+        Run the migration with 
+        
+        rake db:migrate_data
+
+        and start adding functionality

data/lib/generators/admin_tool/templates/assets/javascripts/app.js.erb

@@ -0,0 +1,17 @@
+// This is a manifest file for a CompassAe application that'll be compiled into app.js, which will include all the files
+// listed below in that order.
+//
+// Any JavaScript file within this directory, 
+// engine_name/app/assets/javascripts/erp_app/desktop/applications/app_name
+// engine_name/app/assets/javascripts/extensions/compass_ae/erp_app/desktop/applications/app_name
+// root_app/app/assets/javascripts/extensions/compass_ae/erp_app/desktop/applications/app_name          
+//
+// DON'T ADD ANY CODE HERE, if you do, IT WILL NOT GET LOADED
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+// This custom processor require all the javascript files from the above locations. While this should be enough for most parts, 
+// other processors can be mentioned to specify the load order manually
+// If you want to change the load order from the other engines, extensions and root_app mentioned above, you can add an app.js in those locations. Doing so will then OVERRIDE this app.js and would take files from there.
+//= require ./Module

data/lib/generators/admin_tool/templates/assets/stylesheets/app.css.erb

@@ -0,0 +1,11 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ */

data/lib/generators/application/USAGE

@@ -0,0 +1,23 @@
+Description:
+  Used to create stubs for a new Application within the Compass AE framework
+
+Example:
+    rails g application [name] [description] [menu_icon_url]
+
+    This will create:
+        1. A controller
+        2. Public folder structures
+
+           public/javascripts/erp_app/organizer/applications/[YOUR APP NAME]
+           public/stylesheets/erp_app/organizer/applications/[YOUR APP NAME]
+           public/images/erp_app/organizer/applications/[YOUR APP NAME]
+
+        3. A Javascript template for a application
+        4. A data migration
+        5. Append to the routes file
+        
+        Run the migration with 
+        
+        rake db:migrate_data
+
+        and start adding functionality

data/lib/generators/application/application_generator.rb

@@ -0,0 +1,28 @@
+class ApplicationGenerator < Rails::Generators::NamedBase
+  source_root File.expand_path('../templates', __FILE__)
+  argument :description, :type => :string 
+  argument :menu_item_url, :type => :string
+
+  def generate_desktop_application
+    # Controller
+    template "controllers/controller_template.erb", "app/controllers/erp_app/organizer/#{file_name}/base_controller.rb"
+
+    # make javascript
+    template "assets/javascripts/Application.js.erb", "app/assets/javascripts/erp_app/organizer/applications/#{file_name}/Application.js"
+
+    # make javascript manifest
+    template "assets/javascripts/app.js.erb", "app/assets/javascripts/erp_app/organizer/applications/#{file_name}/app.js"
+
+    # make css manifest
+    template "assets/stylesheets/app.css.erb", "app/assets/stylesheets/erp_app/organizer/applications/#{file_name}/app.css"
+
+    # make images folder
+    empty_directory "app/assets/images/erp_app/organizer/applications/#{file_name}"
+    
+    # add route
+    route "match '/erp_app/organizer/#{file_name}(/:action)' => \"erp_app/organizer/#{file_name}/base\""
+    
+    # migration
+    template "migrate/migration_template.erb", "db/data_migrations/#{RussellEdge::DataMigrator.next_migration_number(1)}_create_#{file_name}_application.rb"
+  end
+end

data/lib/generators/application/templates/INSTALL

@@ -0,0 +1,23 @@
+Description:
+  Used to create stubs for a new Application within the Compass AE framework
+
+Example:
+    rails g application [name] [description] [menu_icon_url]
+
+    This will create:
+        1. A controller
+        2. Public folder structures
+
+           public/javascripts/erp_app/organizer/applications/[YOUR APP NAME]
+           public/stylesheets/erp_app/organizer/applications/[YOUR APP NAME]
+           public/images/erp_app/organizer/applications/[YOUR APP NAME]
+
+        3. A Javascript template for a application
+        4. A data migration
+        5. Append to the routes file
+        
+        Run the migration with 
+        
+        rake db:migrate_data
+
+        and start adding functionality

data/lib/generators/application/templates/assets/javascripts/Application.js.erb

@@ -0,0 +1,20 @@
+Ext.define("Compass.ErpApp.Organizer.Applications.<%= class_name %>.Application", {
+    extend: "Ext.tab.Panel",
+    alias: 'widget.<%= file_name %>application',
+    id: '<%= file_name %>',
+    statics: {
+        menuItems: [
+            {
+                title: '<%= class_name %>',
+                itemId: '<%= file_name %>',
+                imgSrc: '<%= menu_item_url %>'
+            }
+        ],
+        tabs:[
+            {
+                xtype: 'panel',
+                title: 'My tab'
+            }
+        ]
+    }
+});

data/lib/generators/application/templates/assets/javascripts/app.js.erb

@@ -0,0 +1,17 @@
+// This is a manifest file for a CompassAe application that'll be compiled into app.js, which will include all the files
+// listed below in that order.
+//
+// Any JavaScript file within this directory, 
+// engine_name/app/assets/javascripts/erp_app/desktop/applications/app_name
+// engine_name/app/assets/javascripts/extensions/compass_ae/erp_app/desktop/applications/app_name
+// root_app/app/assets/javascripts/extensions/compass_ae/erp_app/desktop/applications/app_name          
+//
+// DON'T ADD ANY CODE HERE, if you do, IT WILL NOT GET LOADED
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+// This custom processor require all the javascript files from the above locations. While this should be enough for most parts, 
+// other processors can be mentioned to specify the load order manually
+// If you want to change the load order from the other engines, extensions and root_app mentioned above, you can add an app.js in those locations. Doing so will then OVERRIDE this app.js and would take files from there.
+//= require ./Application