erp_app 3.1.16 → 4.0.0

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

@@ -0,0 +1,68 @@
+module ErpApp
+  module Shared
+    class AuditLogController < ErpApp::ApplicationController
+      before_filter :require_login
+
+      def index
+        start_date = params[:start_date].to_date
+        end_date = params[:end_date].to_date
+        audit_log_type_id = params[:audit_log_type_id]
+        event_record_type = params[:event_record_type]
+        event_record_id = params[:event_record_id]
+
+        sort_hash = params[:sort].blank? ? {} : Hash.symbolize_keys(JSON.parse(params[:sort]).first)
+        sort = sort_hash[:property] || 'id'
+        dir = sort_hash[:direction] || 'DESC'
+        limit = params[:limit] || 15
+        start = params[:start] || 0
+
+        if start_date.blank? and end_date.blank? and audit_log_type_id.blank?
+          arel_query = AuditLog
+        else
+          audit_logs = AuditLog.arel_table
+
+          arel_query = AuditLog.where(:created_at => (start_date - 1.day)..(end_date + 1.day))
+          arel_query = arel_query.where(audit_logs[:audit_log_type_id].eq(audit_log_type_id)) if audit_log_type_id
+        end
+
+        if event_record_type.present? && event_record_id.present?
+          arel_query = arel_query.where('event_record_type = ? and event_record_id = ?', event_record_type, event_record_id)
+        end
+
+        audit_log_entries = arel_query.order("#{sort} #{dir}").offset(start).limit(limit).all
+
+        total_count = arel_query.count
+
+        render :json => {:total_count => total_count,
+                         :audit_log_entries => audit_log_entries.collect {
+                             |audit_log| audit_log.to_hash(:only => [:id, :description, :created_at],
+                                                           :party_description => audit_log.party.description,
+                                                           :audit_log_type => audit_log.audit_log_type.description) }}
+      end
+
+      def items
+        audit_log_items = AuditLogItem.where('audit_log_id = ? ', params[:audit_log_id])
+
+        data = audit_log_items.collect do |audit_log_item|
+          audit_log_item.to_hash(:only => [:id,
+                                                 :description,
+                                                 :created_at,
+                                                 :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)
+        end
+
+        render :json => {:audit_log_items => data}
+      end
+
+
+      def audit_log_types
+        audit_log_types = AuditLogType.all
+
+        render :json => {:audit_log_types => audit_log_types.collect { |type| type.to_hash(:only => [:id, :description, :internal_identifier]) }}
+      end
+
+    end #AuditLogController
+  end #Shared
+end #ErpApp

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

@@ -7,7 +7,7 @@ module ErpApp
         configuration = ::Configuration.find(params[:id])
         tree_array = [].tap do |array|
           configuration.item_types.collect{|item| item.category_classification.category}.uniq.each do |category|
-            array << category.to_tree_hash(:only => [], :methods => [{:id => :categoryId}], :icon_cls => 'icon-index')
+            array << category.to_tree_hash(:only => [{:id => :categoryId}], :iconCls => 'icon-index')
           end
         end
         tree_array.sort_by!{|hash| [hash[:text]]}
@@ -18,7 +18,7 @@ module ErpApp
         category_id = params[:category_id]
         configuration = ::Configuration.find(params[:id])
         
-        render :json => {:success => true, :configurationItemTypes => configuration.item_types.by_category(Category.find(category_id)).collect(&:to_js_hash).sort_by{|hash| [hash[:internalIdentifier]]}}
+        render :json => {:success => true, :configurationItemTypes => configuration.item_types.by_category(Category.find(category_id)).order('precedence').order('internal_identifier').collect(&:to_js_hash)}
       end
 
       def load
@@ -43,7 +43,7 @@ module ErpApp
           end
 
           render :json => {:success => true, :configurationItems => configuration.items.collect(&:to_js_hash)}
-        rescue Exception=>ex
+        rescue => ex
           logger.error(ex.message)
           logger.error(ex.backtrace)
           render :json => {:success => false, :message => ex.message}

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

@@ -1,54 +1,64 @@
 module ErpApp
-	module Shared
-		class Shared::NotesController < ErpApp::ApplicationController
+  module Shared
+    class NotesController < ErpApp::ApplicationController
       before_filter :require_login
 
-		  def view
-        if params[:party_id].to_i == 0
-          render :json => {:totalCount => 0, :notes => []}
-        else
-          sort_hash = params[:sort].blank? ? {} : Hash.symbolize_keys(JSON.parse(params[:sort]).first)
-          limit = params[:limit] || 30
-          start = params[:start] || 0
-
-          sort = sort_hash[:property] || 'created_at'
-          dir  = sort_hash[:direction] || 'DESC'
-
-          Note.include_root_in_json = false
-			
-          party = Party.find(params[:party_id])
-          notes = party.notes.order("#{sort} #{dir}").limit(limit).offset(start)
-			
-          render :inline => "{\"totalCount\":#{party.notes.count}, \"notes\":#{notes.to_json(:only => [:id, :content, :created_at], :methods => [:summary, :note_type_desc, :created_by_username])}}"
+      def index
+        sort_hash = params[:sort].blank? ? {} : Hash.symbolize_keys(JSON.parse(params[:sort]).first)
+        limit = params[:limit] || 30
+        start = params[:start] || 0
+
+        sort = sort_hash[:property] || 'created_at'
+        dir = sort_hash[:direction] || 'DESC'
+
+        statement = Note
+
+        if params[:record_id] && params[:record_type]
+          statement = Note.where('noted_record_id = ? and noted_record_type = ?', params[:record_id], params[:record_type])
         end
-		  end
 
-		  def create
-        content  = params[:content]
-        note_type = NoteType.find(params[:note_type_id])
-        party = Party.find(params[:party_id])
+        total = statement.count('id')
+        notes = statement.limit(limit).offset(start).order("#{sort} #{dir}")
+
+        render :json => {totalCount: total, notes: notes.collect { |note| note.to_hash(only: [:id, :content, :created_at], methods: [:summary, :note_type_desc, :created_by_username]) }}
+      end
 
-        note = Note.create(
-          :note_type => note_type,
-          :content => content,
-          :created_by_id => current_user.party.id
-        )
+      def create
+        begin
+          ActiveRecord::Base.transaction do
+            content = params[:content]
+            note_type = NoteType.find(params[:note_type_id])
+            record_type = params[:record_type]
+            record_id = params[:record_id]
 
-        party.notes << note
-        party.save
+            Note.create(
+                :note_type => note_type,
+                :content => content,
+                :noted_record_type => record_type,
+                :noted_record_id => record_id,
+                :created_by_id => current_user.party.id
+            )
 
-        render :json => {:success => true}
-		  end
+            render :json => {:success => true}
+          end
+        rescue => ex
+          logger.error ex.message
+          logger.error ex.backtrace.join("\n")
 
-		  def delete
+          render :json => {:success => false, message: ex.message}
+        end
+      end
+
+      def destroy
         Note.find(params[:id]).destroy ? (render :json => {:success => true}) : (render :json => {:success => false})
-		  end
+      end
 
-		  def note_types
+      def note_types
         NoteType.include_root_in_json = false
 
         render :json => {:note_types => NoteType.all}
-		  end
-		end
-	end
-end
+      end
+
+    end # NotesController
+  end # Shared
+end # ErpApp

data/app/controllers/erp_app/widget_proxy_controller.rb

@@ -12,7 +12,7 @@ module ErpApp
       widget_params = nil
       widget_params = JSON.parse(params[:widget_params]) unless params[:widget_params].blank?
 
-      widget_obj = "::Widgets::#{@widget_name.camelize}::Base".constantize.new(self, @widget_name, @widget_action, @uuid, widget_params, @website)
+      widget_obj = "::Widgets::#{@widget_name.camelize}::Base".constantize.new(self, @widget_name, @widget_action, @uuid, widget_params)
 
       result = widget_obj.process(@widget_action)
 
@@ -20,11 +20,13 @@ module ErpApp
       return if result.nil?
 
       if result.is_a?(Hash)
-        render result
+        if !result[:send_file] and !result[:send_data] and !result[:redirect_to]
+          render result
+        end
       else
         render :inline => result
       end
     end
     
-	end
-end
+	end #WidgetProxyController
+end #ErpApp

data/app/models/application.rb

@@ -1,6 +1,6 @@
 class Application < ActiveRecord::Base
   attr_protected :created_at, :updated_at
-  
+
   has_user_preferences
 
   has_and_belongs_to_many :app_containers
@@ -9,9 +9,15 @@ class Application < ActiveRecord::Base
   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
+  end
+
   def locate_resources(resource_type)
     resource_loader = ErpApp::ApplicationResourceLoader::DesktopOrganizerLoader.new(self)
     resource_loader.locate_resources(resource_type)
   end
-  
+
 end

data/app/models/configuration.rb

@@ -1,20 +1,23 @@
 class Configuration < ActiveRecord::Base
   attr_protected :created_at, :updated_at
-  
+
   scope :templates, where('is_template = ?', true)
 
-  validates :internal_identifier, :presence => true, :uniqueness =>  {:scope => [:id, :is_template]}
+  validates :internal_identifier, :presence => true, :uniqueness => {:scope => [:id, :is_template]}
 
   validate :cannot_have_two_templates_per_iid
+
   def cannot_have_two_templates_per_iid
-    unless Configuration.where('id != ?',self.id).where(:is_template => true).where(:internal_identifier => self.internal_identifier).first.nil?
-      errors.add(:is_template, "Cannot have more than one template per configuration")
+    if self.is_template
+      unless Configuration.where('id != ?', self.id).where(:is_template => true).where(:internal_identifier => self.internal_identifier).first.nil?
+        errors.add(:is_template, "Cannot have more than one template per configuration")
+      end
     end
   end
 
   has_many :configuration_items, :dependent => :destroy do
     def by_category(category)
-      includes({:configuration_item_type => [:category_classification]}).where(:category_classifications => {:category_id => category})
+      joins({:configuration_item_type => [:category_classification]}).where(:category_classifications => {:category_id => category})
     end
 
     def grouped_by_category
@@ -23,14 +26,14 @@ class Configuration < ActiveRecord::Base
   end
   has_and_belongs_to_many :configuration_item_types, :uniq => true do
     def by_category(category)
-      includes(:category_classification).where(:category_classifications => {:category_id => category})
+      joins(:category_classification).where(:category_classifications => {:category_id => category})
     end
 
     def grouped_by_category
       group_by(&:category)
     end
   end
-  
+
   alias :items :configuration_items
   alias :item_types :configuration_item_types
 
@@ -39,7 +42,7 @@ class Configuration < ActiveRecord::Base
   end
 
   def add_configuration_item(configuration_item_type, *option_internal_identifiers)
-    option_internal_identifiers = option_internal_identifiers.collect{|item| item.to_s}
+    option_internal_identifiers = option_internal_identifiers.collect { |item| item.to_s }
     configuration_item_type = (configuration_item_type.is_a? ConfigurationItemType) ? configuration_item_type : ConfigurationItemType.find_by_internal_identifier(configuration_item_type.to_s)
 
     item = get_configuration_item(configuration_item_type)
@@ -61,7 +64,7 @@ class Configuration < ActiveRecord::Base
 
   def update_configuration_item(configuration_item_type, *option_internal_identifiers)
     configuration_item_type = (configuration_item_type.is_a? ConfigurationItemType) ? configuration_item_type : ConfigurationItemType.find_by_internal_identifier(configuration_item_type.to_s)
-    
+
     item = self.items.where('configuration_item_type_id = ?', configuration_item_type.id).first
     raise "Configuration item #{configuration_item_type.description} does not exist for configuration #{self.description}" if item.nil?
 
@@ -73,24 +76,26 @@ class Configuration < ActiveRecord::Base
 
   def get_configuration_item(configuration_item_type)
     configuration_item_type = (configuration_item_type.is_a? ConfigurationItemType) ? configuration_item_type : ConfigurationItemType.find_by_internal_identifier(configuration_item_type.to_s)
-    
+
     self.items.where('configuration_item_type_id = ?', configuration_item_type.id).first
   end
 
   alias :get_item :get_configuration_item
 
-  #Clone
+  # Clone
   #
-  #Will copy all configuration item types
+  # Will copy all configuration item types
   #
   # * *Args*
   #   - +set_defaults+ -> create items and set default options default = true
+  #   - +description+ -> description to set = nil
+  #   - +internal_identifier+ -> internal_identifier to set = nil
   # * *Returns* :
   #   - the cloned configuration
-  def clone(set_defaults=true)
+  def clone(set_defaults=true, description=nil, internal_identifier=nil)
     configuration_dup = self.dup
-    configuration_dup.internal_identifier = "#{self.internal_identifier} clone"
-    configuration_dup.description = "#{self.description} clone"
+    configuration_dup.internal_identifier = internal_identifier || self.internal_identifier
+    configuration_dup.description = description || self.description
     configuration_dup.is_template = false
 
     self.configuration_item_types.each do |configuration_item_type|
@@ -105,29 +110,46 @@ class Configuration < ActiveRecord::Base
       configuration_dup.configuration_items << configuration_item
     end
     configuration_dup.save
-    
+
     configuration_dup
   end
 
-  #Copy
+  # Copy
   #
-  #Will copy all configuration item types and items
+  # Will copy all configuration item types and items
   #
+  # * *Args*
+  #   - +description+ -> description to set = nil
+  #   - +internal_identifier+ -> internal_identifier to set = nil
   # * *Returns* :
   #   - the copied configuration
-  def copy
-    configuration_dup = self.clone
-    configuration_dup.internal_identifier = "#{self.internal_identifier} copy"
-    configuration_dup.description = "#{self.description} copy"
+  def copy(description=nil, internal_identifier=nil)
+    configuration_dup = self.dup
+    configuration_dup.internal_identifier = internal_identifier || self.internal_identifier
+    configuration_dup.description = description || self.description
+    configuration_dup.is_template = false
+
+    self.configuration_item_types.each do |configuration_item_type|
+      configuration_dup.configuration_item_types << configuration_item_type
+    end
+    configuration_dup.save
 
     #clone items
     self.configuration_items.each do |item|
       item_dup = item.dup
+
+      # remove old configuration id
+      item_dup.configuration_id = nil
+
       item_dup.configuration_item_type = item.configuration_item_type
       item.configuration_options.each do |option|
-        item_dup.configuration_options << option
+        if option.user_defined
+          item_dup.configuration_options << option.dup
+        else
+          item_dup.configuration_options << option
+        end
+
       end
-      item_dup.save
       configuration_dup.configuration_items << item_dup
     end
 

data/app/models/configuration_item.rb

@@ -26,6 +26,14 @@ class ConfigurationItem < ActiveRecord::Base
     self.save
   end
 
+  def value
+    if options.count == 1
+      options.first.value
+    else
+      options
+    end
+  end
+
   def set_options(internal_identifiers_or_value)
     if self.configuration_item_type.allow_user_defined_options?
       value = internal_identifiers_or_value.first

data/app/models/desktop.rb

@@ -19,20 +19,6 @@ class Desktop < AppContainer
       :preference_option => desktop_backgroud_pt.default_preference_option
     )
 
-    self.user_preferences << UserPreference.create(
-      :user => self.user,
-      :preference => pref
-    )
-
-    #setup theme
-    theme_pt = PreferenceType.iid('extjs_theme')
-    self.preference_types << theme_pt
-
-    pref = Preference.create(
-      :preference_type => theme_pt,
-      :preference_option => theme_pt.default_preference_option
-    )
-
     self.user_preferences << UserPreference.create(
       :user => self.user,
       :preference => pref

data/app/models/organizer.rb

@@ -1,20 +1,6 @@
 class Organizer < AppContainer
   def setup_default_preferences
-    #setup theme
-    theme_pt = PreferenceType.iid('extjs_theme')
-    self.preference_types << theme_pt
 
-    pref = Preference.create(
-      :preference_type => theme_pt,
-      :preference_option => PreferenceOption.iid('blue_extjs_theme')
-    )
-
-    self.user_preferences << UserPreference.create(
-      :user => self.user,
-      :preference => pref
-    )
-
-    self.save
   end
 
   class << self

data/app/models/widget.rb

@@ -4,7 +4,4 @@ class Widget < ActiveRecord::Base
   has_and_belongs_to_many :applications
   has_many :user_preferences, :as => :preferenced_record
 
-  validates_uniqueness_of :xtype, :case_sensitive => false
-  validates_uniqueness_of :internal_identifier, :case_sensitive => false
-
 end

data/app/views/erp_app/desktop/base/index.erb

@@ -5,22 +5,22 @@
 
       <%@desktop.applications.each do |application|%>
       .<%=application.shortcut_id%>-shortcut {
-          background-image: url("/images/icons/<%=application.icon.split('-')[1]%>/<%=application.icon.split('-')[1]%>_48x48.png");
-          height: 48px;
-          width: 48px;
+          background-image: url("/images/icons/<%=application.icon.split('-')[1]%>/<%=application.icon.split('-')[1]%>_64x64.png");
+          height: 64px;
+          width: 64px;
       }
 
       <%end%>
       .control-panel-win-shortcut {
-          background-image: url("/images/icons/control_panel/control_panel_48x48.png");
-          height: 48px;
-          width: 48px;
+          background-image: url("/images/icons/control_panel/control_panel_64x64.png");
+          height: 64px;
+          width: 64px;
       }
 
       .web-navigator-win-shortcut {
-          background-image: url("/images/icons/globe/globe_48x48.png");
-          height: 48px;
-          width: 48px;
+          background-image: url("/images/icons/globe/globe_64x64.png");
+          height: 64px;
+          width: 64px;
       }
 
       #loading-mask {
@@ -55,8 +55,9 @@
   </style>
 
   <!--javascript-->
-  <%= include_extjs(:theme => @desktop.get_preference(:extjs_theme), :debug => (Rails.env != 'production')) %>
+  <%= include_extjs(:debug => (Rails.env != 'production')) %>
   <%= static_javascript_include_tag("extjs/overrides.js") %>
+  <%= static_javascript_include_tag("extjs/Callout.js") %>
 
   <%= static_javascript_include_tag("erp_app/utility.js") %>
   <%= static_javascript_include_tag("erp_app/desktop/ext_ux_desktop_module.js") %>
@@ -68,21 +69,20 @@
   <!-- end shared application resources -->
   <%= static_javascript_include_tag(
               "erp_app/desktop/applications/control_panel/module.js",
-              "erp_app/desktop/applications/control_panel/desktop_management_panel.js",
-              "erp_app/desktop/applications/control_panel/application_management_panel.js",
               "erp_app/desktop/applications/web_navigator/module.js",
               "erp_app/ckeditor/ckeditor.js"
       ) %>
   <!-- application resources -->
   <%= static_javascript_include_tag(@desktop.applications.collect { |app| app.locate_resources('javascripts') }.flatten) %>
   <!-- end application resources -->
-  <%= include_compass_ae_instance_about %>
+  <%= include_compass_ae_instance %>
   <%= set_max_file_upload %>
   <%= set_file_upload_types %>
   <%= set_email_regex %>
 
   <!--stylesheets-->
   <%= static_stylesheet_link_tag('erp_app/desktop/base.css') %>
+  <%= static_stylesheet_link_tag('extjs/resources/css/callout-default.css') %>
   <!-- shared application resources -->
   <%= load_shared_application_resources(:stylesheets) %>
   <!-- end application resources -->
@@ -91,19 +91,8 @@
   <!-- end application resources -->
   <!-- compass extensions -->
   <%= include_code_mirror_library %>
-  <style type="text/css">
-      .CodeMirror {
-          border: 1px solid #eee;
-      }
 
-      .CodeMirror-scroll {
-          height: auto;
-          overflow-y: hidden;
-          overflow-x: auto;
-          width: 100%;
-      }
-  </style>
-  <%= setup_js_authentication(@user, @desktop) %>
+  <%= setup_js_authentication(@user) %>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
   <title>Compass Desktop</title>
 </head>
@@ -111,10 +100,11 @@
 <script type="text/javascript">
     Ext.define("MyDesktop.App", {
         extend: "Ext.ux.desktop.App",
-        requires: ["Ext.window.MessageBox", "Ext.ux.desktop.ShortcutModel"],
+        requires: ["Ext.window.MessageBox", "Ext.ux.desktop.ShortcutModel", "Ext.ux.callout.Callout"],
         init: function () {
             this.callParent()
         },
+
         getModules: function () {
             return[
                 new Compass.ErpApp.Desktop.Applications.ControlPanel(),
@@ -141,7 +131,7 @@
                         <%=raw @desktop.shortcuts.collect{|app| "{name:'#{app.description}',iconCls:'#{app.shortcut_id}-shortcut',module:'#{app.shortcut_id}'}"}.join(",")%>
                     ]
                 }),
-                wallpaper: "/images/wallpaper/<%=@desktop.get_preference(:desktop_background) %>",
+                //wallpaper: "/images/wallpaper/<%=@desktop.get_preference(:desktop_background) %>",
                 wallpaperStretch: true
             })
         },
@@ -149,7 +139,7 @@
             var b = this, a = b.callParent();
             return Ext.apply(a, {
                 title: '<%=@user.party.description%>',
-                iconCls: "icon-user",
+                iconCls: "icon-user-light",
                 height: 300,
                 toolConfig: {
                     width: 100,
@@ -175,6 +165,7 @@
             return Ext.apply(a, {
                 quickStart: [
                     {
+                        ui: 'buttonclean',
                         name: "Control Panel",
                         iconCls: "icon-control_panel",
                         module: "control-panel-win"
@@ -182,6 +173,7 @@
                 ],
                 trayItems: [
                     {
+                        ui: 'buttonclean',
                         xtype: "trayclock",
                         flex: 1
                     }
@@ -211,10 +203,10 @@
 
             var aboutWindow = Ext.create('Ext.window.Window', {
                 title: 'About Your Compass AE Instance',
-                height: 200,
+                height: 400,
                 width: 400,
                 layout: 'fit',
-                resizable: false,
+                resizable: true,
                 autoScroll: true,
                 tpl: tpl,
                 data: compassAeInstance
@@ -229,6 +221,8 @@
 
     var compassDesktop;
     Ext.onReady(function () {
+        Ext.QuickTips.init();
+
         compassDesktop = new MyDesktop.App();
 
         setTimeout(function () {
@@ -237,12 +231,11 @@
             <% @desktop.autoloads.each do |application| %>
             compassDesktop.getModule('<%=application.shortcut_id%>').createWindow();
             <% end %>
-        }, 250);
 
-        // Push some history into this windows history to help prevent back button
-        for (var i = 0; i < 10; i++) {
-            window.history.pushState("history", 'CompassAE Desktop', "#"+i*new Date().getMilliseconds());
-        }
+        }, 1000);
+
+        Compass.ErpApp.Utility.preventBrowserBack();
+        Compass.ErpApp.Utility.setupErpAppLogoutRedirect();
     });
 </script>
 <div id="loading-mask"></div>

data/app/views/erp_app/login/index.erb

@@ -9,17 +9,20 @@
 
     <%= static_javascript_include_tag("erp_app/utility.js","erp_app/login/window.js")%>
     <%= add_authenticity_token_to_extjs%>
+
   </head>
   <body style="background-color:#000;">
-    <div style="text-align:center;width:100%; padding-top: 4%;">
+    <div style="text-align:center;width:100%; padding-top: 4%; margin-bottom: 100px;">
       <img alt="Compass Agile Enterprise" src="/images/art/compass-ae-logo-reverse-1.png" />
    </div>
     <script type="text/javascript">
       Ext.onReady(function(){
-          var appContainers = [['/erp_app/desktop/','CompassAE Desktop'],['/erp_app/organizer/','CompassAE CSR']];
+          var appContainers = [['/erp_app/organizer/','CompassAE CSR'], ['/erp_app/desktop/','CompassAE Desktop']];
           var loginWindow = Ext.create('Compass.ErpApp.Login.Window',{appContainers:appContainers, selectedAppContainerValue:'<%= @app_container %>',redirectTo:'/erp_app/desktop/', logoutTo:'/erp_app/login', message:'<%=flash[:notice]%>', authenticity_token:'<%=form_authenticity_token%>'});
           loginWindow.show();
       });
     </script>
+
+
   </body>
 </html>