erp_app 3.1.16 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a91caef719c4ebbcdc37811a88a6861d7b67ef55
-  data.tar.gz: 1eacf55069d041b40a8138001481e453915767d3
+  metadata.gz: fa6dcf73c601e472ece4e8f1269a9a349f127c52
+  data.tar.gz: 067ea9db24679c2a5e6ca4c0e67c0a9c6fa4c41d
 SHA512:
-  metadata.gz: 630ed9de199c1f01ab7e25232dbc2ae29d0acd3785137a5b297c78ee8562e48f7d52c066642e48a8217f7c4e63be3c5996169bf2553d0169016c3bc5439d75d0
-  data.tar.gz: 6cbfdebc35bd2a6658cfa835fadc059537e2bc46798907f4153e6a834eccc9294ca83f97a81fc6658de557e1d35eb2e038408605911115e10ad7ab82feb7da94
+  metadata.gz: 2afa265208c75956844f600b4d49f967547a2f49cd3981fcfe8a180a9c8322a1c69d7daf90db1decf06b8f10564d6b50003f00296f45d2f318e303ebd7f1391f
+  data.tar.gz: 7a741bffc7a4141a6dd58561573ee93c052332282ed8bdee4bf346ce39393e56f86ae6e9fcd88204735ed81d50ec06b0d8e1e123c47545ff6c8391ee623b30c7

data/README.md

@@ -4,9 +4,6 @@ Provides an application infrastructure based on the Sencha/extjs UI framework, a
 
 ##Initializer Options
 
-- widgets
-  - This should be let as an empty array.  CompassAE will add any available widgets if finds.
-  - Default : []
 - session_warn_after
   - This is the time in minutes when the user will be warned that thier session is about to expire due to inactivity.
   - Default : 18
@@ -19,8 +16,7 @@ Provides an application infrastructure based on the Sencha/extjs UI framework, a
 To override these settings simple create a erp_app.rb file in your initializers and override the config options you want
 
     Rails.application.config.erp_app.configure do |config|
-      config.widgets = []
       config.session_warn_after = 18 #in minutes
       config.session_redirect_after = 20 #in minutes
     end
-    Rails.application.config.erp_app.configure!
+    Rails.application.config.erp_app.configure!

data/app/controllers/erp_app/desktop/configuration_management/base_controller.rb

@@ -112,7 +112,7 @@ module ErpApp
           #set types
           types_hash = {:text => 'Types', :iconCls => 'icon-document_info', :leaf => false, :children => []}
           config.item_types.grouped_by_category.each do |category, config_item_type|
-            category_hash = {:text => category.description, :iconCls => 'icon-documents', :leaf => false, :children => []}
+            category_hash = {:text => (category.nil? ? 'uncategorized' : category.description), :iconCls => 'icon-documents', :leaf => false, :children => []}
             config_item_type.each do |categorized_config_item_type|
               categorized_config_item_type_hash = {:isTemplate => config.is_template, :type => 'ConfigurationType', :model_id => categorized_config_item_type.id, :configuration_id => config.id, :text => categorized_config_item_type.description, :iconCls => 'icon-document_info', :leaf => false, :children => []}
               if categorized_config_item_type.allow_user_defined_options
@@ -152,7 +152,7 @@ module ErpApp
             #set items
             items_hash = {:text => 'Items', :iconCls => 'icon-document_info', :leaf => false, :children => []}
             config.items.grouped_by_category.each do |category, config_item|
-              category_hash = {:text => category.description, :iconCls => 'icon-documents', :leaf => false, :children => []}
+              category_hash = {:text => (category.nil? ? 'uncategorized' : category.description), :iconCls => 'icon-documents', :leaf => false, :children => []}
               config_item.each do |categorized_config_item|
                 categorized_config_item_hash = {:text => categorized_config_item.type.description, :iconCls => 'icon-document_info', :leaf => false, :children => []}
                 categorized_config_item.options.each do |option|

data/app/controllers/erp_app/desktop/configuration_management/options_controller.rb

@@ -6,23 +6,23 @@ module ErpApp
         def index
           options_tbl = ConfigurationOption.arel_table
           arel_query = ConfigurationOption.where(options_tbl[:value].matches("%#{params[:query]}%")
-            .or(options_tbl[:internal_identifier].matches("%#{params[:query]}%")))
-            .where(options_tbl[:user_defined].eq(false))
-            .limit(params[:limit])
-            .offset(params[:start])
+                                                 .or(options_tbl[:internal_identifier].matches("%#{params[:query]}%")))
+          .where(options_tbl[:user_defined].eq(false))
+          .limit(params[:limit])
+          .offset(params[:start])
           options = arel_query.all
 
           respond_to do |format|
             format.json {
               render :json => {
-                :success => true,
-                :total_count => options.count,
-                :options => options.collect{|option|option.to_hash(:only => [:id, :description, :comment, :value, :internal_identifier])}}
+                  :success => true,
+                  :total_count => options.count,
+                  :options => options.collect { |option| option.to_hash(:only => [:id, :description, :comment, :value, :internal_identifier]) }}
             }
             format.tree {
-              render :json => options.collect{|option| option.to_hash(:only => [:internal_identifier, :value, :comment, :description],
-                                              :methods => [{:description => :text}, {:id => :model_id}],
-                                              :additional_values => {:iconCls => 'icon-document', :leaf => true, :children => []})}
+              render :json => options.collect { |option| option.to_hash(:only => [:internal_identifier, :value, :comment, :description],
+                                                                        :text => option.description, :model_id => option.id,
+                                                                        :iconCls => 'icon-document', :leaf => true, :children => []) }
             }
           end
 
@@ -49,7 +49,7 @@ module ErpApp
           end
         end
 
-      end#BaseController
-    end#ConfigurationManagement
-  end#Desktop
-end#ErpApp
+      end #BaseController
+    end #ConfigurationManagement
+  end #Desktop
+end #ErpApp

data/app/controllers/erp_app/desktop/configuration_management/types_controller.rb

@@ -6,7 +6,7 @@ module ErpApp
         def categories
           render :json => {:success => true,
             :categories => Category.all.collect{|category|
-            category.to_hash(:methods => [{:id => :category_id}, :description])}
+            category.to_hash(:methods => [:description], :id => :category_id)}
           }
         end
 
@@ -20,11 +20,11 @@ module ErpApp
         def index
           item_types = [].tap do |item_types_array|
             ConfigurationItemType.all.group_by(&:category).each do |category, categorized_item_types|
-              category_hash = {:text => category.description, :iconCls => 'icon-documents', :leaf => false, :children => []}
+              category_hash = {:text => (category.nil? ? 'uncategorized' : category.description), :iconCls => 'icon-documents', :leaf => false, :children => []}
               categorized_item_types.each do |item_type|
                 categorized_config_item_type_hash = {
                   :type => 'ConfigurationItemType',
-                  :category_id => category.id,
+                  :category_id => (category.nil? ? nil : category.id),
                   :text => item_type.description,
                   :description => item_type.description,
                   :internal_identifier => item_type.internal_identifier,

data/app/controllers/erp_app/desktop/control_panel/application_management_controller.rb

@@ -3,12 +3,12 @@ module ErpApp
 		module ControlPanel
 			class ApplicationManagementController < ErpApp::Desktop::ControlPanel::BaseController
 
-			  def current_user_applcations
+			  def current_user_applications
           user = current_user
 
           node_hashes = []
           desktop = user.desktop
-          desktop.applications.each do |application|
+          desktop.applications.joins(:preference_types).uniq.each do |application|
             node_hashes << {:text => application.description, :iconCls => application.icon, :leaf => true, :id => application.id}
           end
 

data/app/controllers/erp_app/desktop/file_manager/base_controller.rb

@@ -58,7 +58,7 @@ module ErpApp
               messages << message
             end
             render :json => {:success => true, :msg => messages.join(',')}
-          rescue Exception => e
+          rescue => ex
             render :json => {:success => false, :error => ex.message}
           end
         end

data/app/controllers/erp_app/desktop/job_tracker/base_controller.rb

@@ -15,12 +15,11 @@ module ErpApp
 
           render :json => {:total_count => total_count, :success => true,
                            :jobs => job_trackers.collect { |tracker| tracker.to_hash(
-                               :only => [:id, :job_name, :job_klass, :run_time], 
-                               :additional_values => {
-                                 :scheduled => (tracker.scheduled?),
-                                 :last_run_at => (tracker.last_run_at.nil? ? '' : tracker.last_run_at.strftime("%m-%d-%Y %H:%M:%S")),
-                                 :next_run_at => (tracker.next_run_at.nil? ? '' : tracker.next_run_at.strftime("%m-%d-%Y %H:%M:%S")),
-                                 }) }}
+                               :only => [:id, :job_name, :job_klass, :run_time],
+                               :scheduled => (tracker.scheduled?),
+                               :last_run_at => (tracker.last_run_at.nil? ? '' : tracker.last_run_at.utc),
+                               :next_run_at => (tracker.next_run_at.nil? ? '' : tracker.next_run_at.utc),
+                           ) }}
         end
 
         def schedule

data/app/controllers/erp_app/desktop/security_management/base_controller.rb

@@ -2,7 +2,7 @@ module ErpApp
   module Desktop
     module SecurityManagement
       class BaseController < ::ErpApp::Desktop::BaseController
-      
+
         # used for related_searchbox
         def search
           if params[:model].blank? or (params[:displayField].blank? and params[:search_fields].blank?)
@@ -16,7 +16,7 @@ module ErpApp
               search_fields = params[:search_fields].split(',')
               unless params[:query].blank?
                 sql = ''
-                search_fields.each_with_index do |f,i|
+                search_fields.each_with_index do |f, i|
                   sql += " OR " if i > 0
                   sql += "UPPER(#{f}) LIKE UPPER('%#{params[:query]}%')"
                 end
@@ -27,7 +27,7 @@ module ErpApp
 
             total = query.count
             data = query.all
-            render :inline => { :data => data, :total => total}.to_json
+            render :inline => {:data => data, :total => total}.to_json
           end
         end
 
@@ -36,12 +36,12 @@ module ErpApp
           offset = params[:start].to_f
           offset > 0 ? (offset / params[:limit].to_f).to_i + 1 : 1
         end
-        
+
         def per_page
           params[:limit].nil? ? 10 : params[:limit].to_i
         end
 
       end
-    end#SecurityManagement
-  end#Desktop
-end#ErpApp
+    end #SecurityManagement
+  end #Desktop
+end #ErpApp

data/app/controllers/erp_app/desktop/security_management/capabilities_controller.rb

@@ -6,37 +6,32 @@ module ErpApp
         def available_setup
           begin
             columns = []
-            columns << DynamicGridColumn.build_column({ :fieldLabel => "Description", :name => 'description', :xtype => 'textfield', :width => 395 })
+            columns << {header: 'Security Role Name', dataIndex: 'description', flex: 1}
 
             definition = []
-            definition << DynamicFormField.textfield({ :fieldLabel => "Description", :name => 'description' })
-            definition << DynamicFormField.hidden({ :fieldLabel => "ID", :name => 'id' })
-
-            render :inline => "{
-              \"success\": true,
-              \"columns\": [#{columns.join(',')}],
-              \"fields\": #{definition.to_json}
-            }"
-          rescue Exception => e
-            Rails.logger.error e.message
-            Rails.logger.error e.backtrace.join("\n")
-            render :inline => {
-              :success => false,
-              :message => e.message
-            }.to_json             
+            definition << {fieldLabel: 'Description', name: 'description'}
+            definition << {fieldLabel: 'ID', name: 'id'}
+
+            render :json => {success: true, columns: columns, fields: definition}
+
+          rescue => ex
+            Rails.logger.error ex.message
+            Rails.logger.error ex.backtrace.join("\n")
+
+            render :json => {success: false, message: ex.message}
           end
         end
 
         def selected_setup
           available_setup
         end
-        
+
         def available
           assign_to = params[:assign_to]
           assign_to_id = params[:id]
-          sort  = (params[:sort] || 'description').downcase
+          sort = (params[:sort] || 'description').downcase
           sort = 'capabilities.description' if sort == 'description'
-          dir   = (params[:dir] || 'asc').downcase
+          dir = (params[:dir] || 'asc').downcase
           query_filter = params[:query_filter].strip rescue nil
           scope_type_ids = [ScopeType.find_by_internal_identifier('class').id, ScopeType.find_by_internal_identifier('query').id]
 
@@ -44,15 +39,15 @@ module ErpApp
           ar = (params[:query_filter].blank? ? ar : ar.where("(UPPER(capabilities.description) LIKE UPPER('%#{query_filter}%'))"))
           available = ar.paginate(:page => page, :per_page => per_page, :order => "#{sort} #{dir}")
 
-          render :json => {:total => ar.count, :data => available.map{|x| {:description => x.description, :id => x.id}}}
+          render :json => {:total => ar.count, :data => available.map { |x| {:description => x.description, :id => x.id} }}
         end
 
         def selected
           assign_to = params[:assign_to]
           assign_to_id = params[:id]
-          sort  = (params[:sort] || 'description').downcase
+          sort = (params[:sort] || 'description').downcase
           sort = 'capabilities.description' if sort == 'description'
-          dir   = (params[:dir] || 'asc').downcase
+          dir = (params[:dir] || 'asc').downcase
           query_filter = params[:query_filter].strip rescue nil
 
           scope_type_ids = [ScopeType.find_by_internal_identifier('class').id, ScopeType.find_by_internal_identifier('query').id]
@@ -61,7 +56,7 @@ module ErpApp
           ar = (params[:query_filter].blank? ? ar : ar.where("(UPPER(capabilities.description) LIKE UPPER('%#{query_filter}%'))"))
           selected = ar.paginate(:page => page, :per_page => per_page, :order => "#{sort} #{dir}")
 
-          render :json => {:total => ar.count, :data => selected.map{|x| {:total => ar.count, :description => x.description, :id => x.id}}}
+          render :json => {:total => ar.count, :data => selected.map { |x| {:total => ar.count, :description => x.description, :id => x.id} }}
         end
 
         def add
@@ -74,12 +69,12 @@ module ErpApp
             selected.each do |c|
               capability = Capability.find(c)
               case assign_to
-              when 'User'
-                a.add_capability(capability)
-              when 'SecurityRole'
-                a.add_capability(capability)
-              when 'Group'
-                a.add_capability(capability)
+                when 'User'
+                  a.add_capability(capability)
+                when 'SecurityRole'
+                  a.add_capability(capability)
+                when 'Group'
+                  a.add_capability(capability)
               end
             end
 
@@ -88,9 +83,9 @@ module ErpApp
             Rails.logger.error e.message
             Rails.logger.error e.backtrace.join("\n")
             render :inline => {
-              :success => false,
-              :message => e.message
-            }.to_json             
+                :success => false,
+                :message => e.message
+            }.to_json
           end
         end
 
@@ -104,12 +99,12 @@ module ErpApp
             selected.each do |c|
               capability = Capability.find(c)
               case assign_to
-              when 'User'
-                a.remove_capability(capability)
-              when 'SecurityRole'
-                a.remove_capability(capability)
-              when 'Group'
-                a.remove_capability(capability)
+                when 'User'
+                  a.remove_capability(capability)
+                when 'SecurityRole'
+                  a.remove_capability(capability)
+                when 'Group'
+                  a.remove_capability(capability)
               end
             end
 
@@ -118,12 +113,12 @@ module ErpApp
             Rails.logger.error e.message
             Rails.logger.error e.backtrace.join("\n")
             render :inline => {
-              :success => false,
-              :message => e.message
-            }.to_json             
+                :success => false,
+                :message => e.message
+            }.to_json
           end
         end
-        
+
       end
     end
   end

data/app/controllers/erp_app/desktop/security_management/groups_controller.rb

@@ -6,59 +6,54 @@ module ErpApp
         def available_setup
           begin
             columns = []
-            columns << DynamicGridColumn.build_column({ :fieldLabel => "Group Name", :name => 'description', :xtype => 'textfield', :width => 395 })
+            columns << {header: 'Group Name', dataIndex: 'description', flex: 1}
 
             definition = []
-            definition << DynamicFormField.textfield({ :fieldLabel => "Group Name", :name => 'description' })
-            definition << DynamicFormField.hidden({ :fieldLabel => "ID", :name => 'id' })
-
-            render :inline => "{
-              \"success\": true,
-              \"columns\": [#{columns.join(',')}],
-              \"fields\": #{definition.to_json}
-            }"
-          rescue Exception => e
-            Rails.logger.error e.message
-            Rails.logger.error e.backtrace.join("\n")
-            render :inline => {
-              :success => false,
-              :message => e.message
-            }.to_json             
+            definition << {fieldLabel: 'Group Name', name: 'description'}
+            definition << {fieldLabel: 'ID', name: 'id'}
+
+            render :json => {success: true, columns: columns, fields: definition}
+
+          rescue => ex
+            Rails.logger.error ex.message
+            Rails.logger.error ex.backtrace.join("\n")
+
+            render :json => {success: false, message: ex.message}
           end
         end
 
         def selected_setup
           available_setup
         end
-        
+
         def available
           assign_to = params[:assign_to]
           assign_to_id = params[:id]
-          sort  = (params[:sort] || 'description').downcase
+          sort = (params[:sort] || 'description').downcase
           sort = 'groups.description' if sort == 'description'
-          dir   = (params[:dir] || 'asc').downcase
+          dir = (params[:dir] || 'asc').downcase
           query_filter = params[:query_filter].strip rescue nil
 
           ar = assign_to_id.blank? ? Group : assign_to.constantize.find(assign_to_id).groups_not
           ar = (params[:query_filter].blank? ? ar : ar.where("UPPER(groups.description) LIKE UPPER('%#{query_filter}%')"))
           available = ar.paginate(:page => page, :per_page => per_page, :order => "#{sort} #{dir}")
 
-          render :json => {:total => ar.count, :data => available.map{|x| {:description => x.description, :id => x.id}}}
+          render :json => {:total => ar.count, :data => available.map { |x| {:description => x.description, :id => x.id} }}
         end
 
         def selected
           assign_to = params[:assign_to]
           assign_to_id = params[:id]
-          sort  = (params[:sort] || 'description').downcase
+          sort = (params[:sort] || 'description').downcase
           sort = 'groups.description' if sort == 'description'
-          dir   = (params[:dir] || 'asc').downcase
+          dir = (params[:dir] || 'asc').downcase
           query_filter = params[:query_filter].strip rescue nil
 
           ar = assign_to_id.blank? ? Group : assign_to.constantize.find(assign_to_id).groups
           ar = (params[:query_filter].blank? ? ar : ar.where("UPPER(groups.description) LIKE UPPER('%#{query_filter}%')"))
           selected = ar.paginate(:page => page, :per_page => per_page, :order => "#{sort} #{dir}")
 
-          render :json => {:total => ar.count, :data => selected.map{|x| {:description => x.description, :id => x.id}}}
+          render :json => {:total => ar.count, :data => selected.map { |x| {:description => x.description, :id => x.id} }}
         end
 
         def create
@@ -66,18 +61,18 @@ module ErpApp
             description = params[:description].strip
 
             unless description.blank?
-              Group.create(:description => params[:description]) 
+              Group.create(:description => params[:description])
               render :json => {:success => true, :message => 'Group created'}
             else
               raise "Group name blank"
             end
-          rescue Exception => e
-            Rails.logger.error e.message
-            Rails.logger.error e.backtrace.join("\n")
+          rescue => ex
+            Rails.logger.error ex.message
+            Rails.logger.error ex.backtrace.join("\n")
             render :inline => {
-              :success => false,
-              :message => e.message
-            }.to_json             
+                :success => false,
+                :message => ex.message
+            }.to_json
           end
         end
 
@@ -93,31 +88,31 @@ module ErpApp
             else
               raise "Group name blank or no group ID"
             end
-          rescue Exception => e
-            Rails.logger.error e.message
-            Rails.logger.error e.backtrace.join("\n")
+          rescue => ex
+            Rails.logger.error ex.message
+            Rails.logger.error ex.backtrace.join("\n")
             render :inline => {
-              :success => false,
-              :message => e.message
-            }.to_json             
+                :success => false,
+                :message => ex.message
+            }.to_json
           end
         end
 
         def delete
           begin
             unless params[:id].blank?
-              Group.destroy(params[:id]) 
+              Group.destroy(params[:id])
               render :json => {:success => true, :message => 'Group deleted'}
             else
               raise "No Group ID"
             end
-          rescue Exception => e
-            Rails.logger.error e.message
-            Rails.logger.error e.backtrace.join("\n")
+          rescue => ex
+            Rails.logger.error ex.message
+            Rails.logger.error ex.backtrace.join("\n")
             render :inline => {
-              :success => false,
-              :message => e.message
-            }.to_json             
+                :success => false,
+                :message => ex.message
+            }.to_json
           end
         end
 
@@ -131,23 +126,23 @@ module ErpApp
             selected.each do |g|
               group = Group.find(g)
               case assign_to
-              when 'User'
-                group.add_user(a)
-              when 'SecurityRole'
-                group.add_role(a)
-              when 'Capability'
-                group.add_capability(a)
+                when 'User'
+                  group.add_user(a)
+                when 'SecurityRole'
+                  group.add_role(a)
+                when 'Capability'
+                  group.add_capability(a)
               end
             end
 
             render :json => {:success => true, :message => 'Group(s) Added'}
-          rescue Exception => e
-            Rails.logger.error e.message
-            Rails.logger.error e.backtrace.join("\n")
+          rescue => ex
+            Rails.logger.error ex.message
+            Rails.logger.error ex.backtrace.join("\n")
             render :inline => {
-              :success => false,
-              :message => e.message
-            }.to_json             
+                :success => false,
+                :message => ex.message
+            }.to_json
           end
         end
 
@@ -161,39 +156,39 @@ module ErpApp
             selected.each do |g|
               group = Group.find(g)
               case assign_to
-              when 'User'
-                group.remove_user(a)
-              when 'SecurityRole'
-                group.remove_role(a)
-              when 'Capability'
-                group.remove_capability(a)
+                when 'User'
+                  group.remove_user(a)
+                when 'SecurityRole'
+                  group.remove_role(a)
+                when 'Capability'
+                  group.remove_capability(a)
               end
             end
 
             render :json => {:success => true, :message => 'Group(s) Removed'}
-          rescue Exception => e
-            Rails.logger.error e.message
-            Rails.logger.error e.backtrace.join("\n")
+          rescue => ex
+            Rails.logger.error ex.message
+            Rails.logger.error ex.backtrace.join("\n")
             render :inline => {
-              :success => false,
-              :message => e.message
-            }.to_json             
+                :success => false,
+                :message => ex.message
+            }.to_json
           end
         end
-        
+
         def effective_security
           begin
             assign_to_id = params[:id]
             u = Group.find(assign_to_id)
 
-            render :json => {:success => true, :capabilities => u.class_capabilities_to_hash }
-          rescue Exception => e
-            Rails.logger.error e.message
-            Rails.logger.error e.backtrace.join("\n")
+            render :json => {:success => true, :capabilities => u.class_capabilities_to_hash}
+          rescue => ex
+            Rails.logger.error ex.message
+            Rails.logger.error ex.backtrace.join("\n")
             render :inline => {
-              :success => false,
-              :message => e.message
-            }.to_json             
+                :success => false,
+                :message => ex.message
+            }.to_json
           end
         end