erp_app 4.0.0 → 4.2.0

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

@@ -1,53 +1,85 @@
 module ErpApp
-	module Desktop
-		module UserManagement
-			class ApplicationManagementController < ErpApp::Desktop::UserManagement::BaseController
-			  
-			  def available_applications
-          user_id            = params[:user_id]
-          app_container_type = params[:app_container_type]
+  module Desktop
+    module UserManagement
+      class ApplicationManagementController < ErpApp::Desktop::UserManagement::BaseController
+
+        def available_applications
+          user_id = params[:user_id]
+          desktop_applications = params[:desktop_applications].present?
 
           user = User.find(user_id)
-          app_container = "::#{app_container_type}".constantize.find_by_user(user)
-          applications  = "#{app_container_type}Application".constantize.all
 
-          current_applications = app_container.applications
-          applications.delete_if{|r| current_applications.collect(&:id).include?(r.id)}
+          if desktop_applications
+            accessible_applications = Application.tools.scope_by_dba(current_user.party.dba_organization)
+
+            current_applications = user.desktop_applications
+            available_applications = if current_applications.empty?
+                                       accessible_applications
+                                     else
+                                       accessible_applications.where("applications.id not in (#{current_applications.collect(&:id).join(',')})")
+                                     end
+          else
+            accessible_applications = Application.apps.scope_by_dba(current_user.party.dba_organization)
 
-          render :json => applications.map{|application| {:text => application.description, :app_id => application.id, :iconCls => application.icon, :leaf => true}}
-			  end
+            current_applications = user.apps
+            available_applications = if current_applications.empty?
+                                       accessible_applications
+                                     else
+                                       accessible_applications.where("applications.id not in (#{current_applications.collect(&:id).join(',')})")
+                                     end
+          end
 
-			  def current_applications
-          user_id            = params[:user_id]
-          app_container_type = params[:app_container_type]
+          render :json => available_applications.map { |application| {:text => application.description,
+                                                                      :app_id => application.id,
+                                                                      :iconCls => application.icon, :leaf => true} }
+        end
+
+        def current_applications
+          user_id = params[:user_id]
+          desktop_applications = params[:desktop_applications].present?
 
           user = User.find(user_id)
-          app_container = "::#{app_container_type}".constantize.find_by_user(user)
-          
-          render :json => app_container.applications.map{|application| {:text => application.description, :app_id => application.id, :iconCls => application.icon, :leaf => true}}
-			  end
 
-			  def save_applications
-          app_ids            = params[:app_ids]
-          user_id            = params[:user_id]
-          app_container_type = params[:app_container_type]
+          current_applications = if desktop_applications
+                                   user.desktop_applications
+                                 else
+                                   user.apps
+                                 end
+
+          render :json => current_applications.map { |application| {:text => application.description,
+                                                                    :app_id => application.id,
+                                                                    :iconCls => application.icon,
+                                                                    :leaf => true} }
+        end
+
+        def save_applications
+          app_ids = params[:app_ids]
+          user_id = params[:user_id]
+          desktop_applications = params[:desktop_applications].present?
 
           user = User.find(user_id)
-          app_container = "::#{app_container_type}".constantize.find_by_user(user)
-          app_container.applications = []
-          app_container.save
+
+          if desktop_applications
+            user.desktop_applications = []
+          else
+            user.apps = []
+          end
 
           unless app_ids.blank?
             app_ids.each do |app_id|
-              app_container.applications << Application.find(app_id)
+              if desktop_applications
+                user.desktop_applications << Application.find(app_id)
+              else
+                user.apps << Application.find(app_id)
+              end
             end
           end
-          app_container.save
-				
+          user.save
+
           render :json => {:success => true, :message => 'Application(s) Saved'}
-			  end
-			  
-			end
-		end
-	end
-end
+        end
+
+      end # ApplicationManagementController
+    end # UserManagement
+  end # Desktop
+end # ErpApp

data/app/controllers/erp_app/login_controller.rb

@@ -3,8 +3,8 @@ module ErpApp
     layout :nil
 
     def index
-      if session[:return_to_url]
-        if session[:return_to_url].include? 'erp_app/desktop'
+      if session[:app_container]
+        if session[:app_container] == :desktop
           @app_container = '/erp_app/desktop/'
         else
           @app_container = '/erp_app/organizer/'
@@ -16,7 +16,35 @@ module ErpApp
           @app_container = '/erp_app/organizer/'
         end
       end
+    end
+
+    def reset_password
+      @token = params[:token].present? ? params[:token].strip : nil
+      @user = User.load_from_reset_password_token(@token)
+
+      if @user.blank?
+        flash[:notice] = 'Invalid Reset Token'
+        redirect_to action: :index
+      end
+    end
 
+    def update_password
+      @token = params[:token].strip
+      @user = User.load_from_reset_password_token(@token)
+
+      if @user.blank?
+        render :update => {:id => "#{@uuid}_result", :view => :invalid_reset_token}
+      else
+        # the next line makes the password confirmation validation work
+        @user.password_confirmation = params[:password_confirmation].strip
+        # the next line clears the temporary token and updates the password
+        if @user.change_password!(params[:password].strip)
+          flash[:notice] = 'Password Reset Successfully'
+          render json: {success: true}
+        else
+          render json: {success: false, message: @user.errors.full_messages.join('<br/>')}
+        end
+      end
     end
 
   end

data/app/controllers/erp_app/organizer/base_controller.rb

@@ -6,35 +6,8 @@ module ErpApp
 		  
 		  def index
         @user = current_user
-        @organizer = @user.organizer
-		  end
-		  
-		  def get_preferences
-        user = current_user
-        organizer = ::Organizer.find_by_user(user)
-
-        render :inline => "{\"success\":true, \"preferences\":#{organizer.preferences.to_json(:include => [:preference_type, :preference_option])}}"
-		  end
-
-		  def setup_preferences
-		    user = current_user
-        organizer = ::Organizer.find_by_user(user)
-			
-        render :inline => "{\"success\":true, \"preference_types\":#{organizer.preference_types.to_json(:include => :preference_options)}}"
-		  end
-
-		  def update_preferences
-        user = current_user
-        organizer = ::Organizer.find_by_user(user)
-
-        params.each do |k,v|
-          organizer.set_preference(k, v) unless (k.to_s == 'action' or k.to_s == 'controller' or k.to_s == 'authenticity_token')
-        end
-        organizer.save
-			
-        render :inline => "{\"success\":true, \"preferences\":#{organizer.preferences.to_json(:include => [:preference_type, :preference_option])}}"
 		  end
       
-		end#BaseController
-	end#Organizer
-end#ErpApp
+		end # BaseController
+	end # Organizer
+end # ErpApp

data/app/controllers/erp_app/organizer/crm/contact_mechanisms_controller.rb

@@ -51,6 +51,7 @@ module ErpApp
           params.delete(:party_id)
           params.delete(:contact_type)
           params.delete(:contact_purpose)
+          params.delete(:client_utc_offset)
 
           contact_mechanism_class = contact_type.constantize
           party = Party.find(party_id)
@@ -86,6 +87,7 @@ module ErpApp
           params.delete(:contact_purpose)
           params.delete(:updated_at)
           params.delete(:created_at)
+          params.delete(:client_utc_offset)
 
           klass = contact_type.constantize
 
@@ -137,9 +139,9 @@ module ErpApp
           message = params[:message].strip
           cc_email = params[:cc_email].blank? ? nil : params[:cc_email].strip
 
-          CrmMailer.send_message(send_to.email_address, subject, message).deliver
+          CrmMailer.send_message(send_to.email_address, subject, message, current_user.party.dba_organization).deliver
 
-          CrmMailer.send_message(cc_email, subject, message).deliver if cc_email
+          CrmMailer.send_message(cc_email, subject, message, current_user.party.dba_organization).deliver if cc_email
 
           render :json => {:success => true}
         end

data/app/controllers/erp_app/organizer/crm/parties_controller.rb

@@ -84,11 +84,28 @@ module ErpApp
           offset = params[:start] || 0
           limit = params[:limit] || 25
           query_filter = params[:query_filter] || nil
-
+          sort_hash = params[:sort].blank? ? {} : Hash.symbolize_keys(JSON.parse(params[:sort]).first)
           to_role = params[:to_role]
           party_role = params[:party_role]
           to_party_id = params[:to_party_id]
 
+          #
+          # Convert sort parameters that are mapped Extjs fields
+          #
+          if sort_hash[:property] == 'createdAt'
+            sort_hash[:property] = 'created_at'
+          elsif sort_hash[:property] == 'updatedAt'
+            sort_hash[:property] = 'updated_at'
+          elsif sort_hash[:property] == 'model'
+            sort_hash[:property] = 'business_party_type'
+          end
+
+          #
+          # Default to sort by description ascending if no sort parameters
+          #
+          order_by = sort_hash[:property] || 'description'
+          direction = sort_hash[:direction] || 'asc'
+
           if params[:party_ids].present?
             statement = Party.where(:id => params[:party_ids].split(','))
           else
@@ -121,7 +138,7 @@ module ErpApp
           total = statement.uniq.count
 
           # Apply limit and offset
-          parties = statement.uniq.limit(limit).offset(offset).all
+          parties = statement.uniq.order("#{order_by} #{direction}").limit(limit).offset(offset).all
 
           render :json => {
               :success => true,
@@ -205,6 +222,8 @@ module ErpApp
             params.delete(:tax_id_number)
           end
 
+          params.delete(:client_utc_offset)
+
           # clean up data
           business_party_data.each do |k, v|
             business_party_data[k] = business_party_data[k].strip
@@ -271,6 +290,8 @@ module ErpApp
                 params.delete(:tax_id_number)
               end
 
+              params.delete(:client_utc_offset)
+
               # clean up data
               params.each do |k, v|
                 params[k] = params[k].strip
@@ -308,6 +329,9 @@ module ErpApp
           rescue => ex
             Rails.logger.error ex.message
             Rails.logger.error ex.backtrace.join("\n")
+
+            ExceptionNotifier.notify_exception(ex) if defined? ExceptionNotifier
+
             result = {:success => false, :message => "Error adding #{party_type}."}
           end
 

data/app/controllers/erp_app/organizer/crm/users_controller.rb

@@ -14,6 +14,24 @@ module ErpApp
 
           # determine sorting
           sort_hash = params[:sort].present? ? ActiveSupport::JSON.decode(params[:sort]).first : {}
+
+          #
+          # Convert sort parameters that are mapped Extjs fields
+          #
+          if sort_hash['property'] == 'createdAt'
+            sort_hash['property'] = 'created_at'
+          elsif sort_hash['property'] == 'updatedAt'
+            sort_hash['property'] = 'updated_at'
+          elsif sort_hash['property'] == 'status'
+            sort_hash['property'] = 'activation_state'
+          elsif sort_hash['property'] == 'lastLoginAt'
+            sort_hash['property'] = 'last_login_at'
+          elsif sort_hash['property'] == 'lastLogoutAt'
+            sort_hash['property'] = 'last_logout_at'
+          elsif sort_hash['property'] == 'lastActivityAt'
+            sort_hash['property'] = 'last_activity_at'
+          end
+
           order_by = sort_hash['property'] || 'created_at'
           direction = sort_hash['direction'] || 'desc'
 
@@ -59,6 +77,8 @@ module ErpApp
                                              [:id, :username,
                                               :email,
                                               :last_login_at,
+                                              :last_logout_at,
+                                              :last_activity_at,
                                               :created_at,
                                               :updated_at,
                                               :activation_state],
@@ -190,6 +210,8 @@ module ErpApp
             Rails.logger.error ex.message
             Rails.logger.error ex.backtrace.join("\n")
 
+            ExceptionNotifier.notify_exception(ex) if defined? ExceptionNotifier
+
             result = {:success => false, :message => "Error adding user."}
           end
 

data/app/controllers/erp_app/public_controller.rb

@@ -38,6 +38,9 @@ module ErpApp
           rescue => ex
             Rails.logger.error ex.message
             Rails.logger.error ex.backtrace.join("\n")
+
+            ExceptionNotifier.notify_exception(ex) if defined? ExceptionNotifier
+
             render :text => ex.message and return
           end
         else

data/app/controllers/erp_app/shared/audit_log_controller.rb

@@ -50,7 +50,7 @@ module ErpApp
                                                  :audit_log_id,
                                                  {:audit_log_item_value => :new_value},
                                                  {:audit_log_item_old_value => :old_value}],
-                                 :audit_log_item_type => audit_log_item.type.description)
+                                 :audit_log_item_type => audit_log_item.try(:type).try(:description))
         end
 
         render :json => {:audit_log_items => data}

data/app/controllers/erp_app/shared/configuration_controller.rb

@@ -39,7 +39,7 @@ module ErpApp
                 options_array << option
               end
             end
-            configuration.update_configuration_item(ConfigurationItemType.find_by_internal_identifier(k), options) unless (k.to_s == 'action' or k.to_s == 'controller' or k.to_s == 'id' or k.to_s == 'authenticity_token')
+            configuration.update_configuration_item(ConfigurationItemType.find_by_internal_identifier(k), options) unless (k.to_s == 'action' or k.to_s == 'controller' or k.to_s == 'id' or k.to_s == 'authenticity_token' or k.to_s == 'client_utc_offset')
           end
 
           render :json => {:success => true, :configurationItems => configuration.items.collect(&:to_js_hash)}

data/app/controllers/erp_app/shared/notes_controller.rb

@@ -53,12 +53,6 @@ module ErpApp
         Note.find(params[:id]).destroy ? (render :json => {:success => true}) : (render :json => {:success => false})
       end
 
-      def note_types
-        NoteType.include_root_in_json = false
-
-        render :json => {:note_types => NoteType.all}
-      end
-
     end # NotesController
   end # Shared
 end # ErpApp

data/app/controllers/erp_app/widget_proxy_controller.rb

@@ -1,8 +1,10 @@
 module ErpApp
-	class WidgetProxyController < ErpApp::ApplicationController
-	  
+  class WidgetProxyController < ErpApp::ApplicationController
+
     attr_accessor :performed_redirect
 
+    protect_from_forgery :except => :clear
+
     def index
       @widget_name = params[:widget_name]
       @widget_action = params[:widget_action]
@@ -27,6 +29,18 @@ module ErpApp
         render :inline => result
       end
     end
-    
-	end #WidgetProxyController
-end #ErpApp
+
+    def clear
+      unless params[:uuids].blank?
+        params[:uuids].split(',').each do |uuid|
+          if session[:widgets] and session[:widgets][uuid]
+            session[:widgets].delete(uuid)
+          end
+        end
+      end
+
+      render json: {success: true}
+    end
+
+  end # WidgetProxyController
+end # ErpApp

data/app/mailers/crm_mailer.rb

@@ -1,8 +1,9 @@
 class CrmMailer < ActionMailer::Base
   default :from => ErpTechSvcs::Config.email_notifications_from
 
-  def send_message(to_email, subject, message)
+  def send_message(to_email, subject, message, dba_organization=nil)
     @message = message
+    
     mail(:to => to_email, :subject => subject)
   end
 

data/app/models/application.rb

@@ -1,23 +1,105 @@
+# create_table :applications do |t|
+#   t.column :description, :string
+#   t.column :icon, :string
+#   t.column :internal_identifier, :string
+#   t.column :type, :string
+#   t.column :can_delete, :boolean, :default => true
+#
+#   t.timestamps
+# end
+#
+# add_index :applications, :internal_identifier, :name => 'applications_internal_identifier_idx'
+
 class Application < ActiveRecord::Base
   attr_protected :created_at, :updated_at
 
   has_user_preferences
+  has_file_assets
+  has_party_roles
 
-  has_and_belongs_to_many :app_containers
-  has_and_belongs_to_many :widgets
+  has_and_belongs_to_many :users
 
-  validates_uniqueness_of :javascript_class_name, :allow_nil => true
   validates_uniqueness_of :internal_identifier, :scope => :type, :case_sensitive => false
 
   class << self
     def iid(internal_identifier)
       find_by_internal_identifier(internal_identifier)
     end
+
+    def generate_unique_iid(name)
+      iid = name.to_iid
+
+      iid_exists = true
+      iid_test = iid
+      iid_counter = 1
+      while iid_exists
+        if Application.where(internal_identifier: iid_test).first
+          iid_test = "#{iid}_#{iid_counter}"
+          iid_counter += 1
+        else
+          iid_exists = false
+          iid = iid_test
+        end
+      end
+
+      iid
+    end
+
+    def apps
+      where('type is null')
+    end
+
+    # scope by dba organization
+    #
+    # @param dba_organization [Party] dba organization to scope by
+    #
+    # @return [ActiveRecord::Relation]
+    def scope_by_dba_organization(dba_organization)
+      scope_by_party(dba_organization, {role_types: [RoleType.iid('dba_org')]})
+    end
+
+    alias scope_by_dba scope_by_dba_organization
+
+    # scope by party
+    #
+    # @param party [Integer | Party | Array] either a id of Party record, a Party record, an array of Party records
+    # or an array of Party ids
+    # @param options [Hash] options to apply to this scope
+    # @option options [Array] :role_types role types to include in the scope
+    #
+    # @return [ActiveRecord::Relation]
+    def scope_by_party(party, options={})
+      table_alias = String.random
+
+      statement = joins("inner join entity_party_roles as \"#{table_alias}\" on \"#{table_alias}\".entity_record_id = applications.id
+                         and \"#{table_alias}\".entity_record_type = 'Application'")
+      .where("#{table_alias}.party_id" => party).uniq
+
+      if options[:role_types]
+        statement = statement.where("#{table_alias}.role_type_id" => RoleType.find_child_role_types(options[:role_types]))
+      end
+
+      statement
+    end
+
+    def allows_business_modules
+      where('allow_business_modules = ?', true)
+    end
+
+    def desktop_applications
+      where('type = ?', 'DesktopApplication')
+    end
+    
+    alias tools desktop_applications
   end
 
-  def locate_resources(resource_type)
-    resource_loader = ErpApp::ApplicationResourceLoader::DesktopOrganizerLoader.new(self)
-    resource_loader.locate_resources(resource_type)
+  def to_data_hash
+    to_hash(only: [:id,
+                   :description,
+                   :internal_identifier,
+                   :icon,
+                   :created_at,
+                   :updated_at])
   end
 
 end