erp_app 3.0.7 → 3.0.8

data/public/javascripts/erp_app/organizer/layout.js

@@ -1,7 +1,7 @@
 Ext.ns("Compass.ErpApp.Organizer.Applications");
 
-Compass.ErpApp.Organizer.Layout = function(config){
-   
+Compass.ErpApp.Organizer.Layout = function (config) {
+
     this.layoutConfig = config;
 
     //used to build accordion menu
@@ -9,55 +9,69 @@ Compass.ErpApp.Organizer.Layout = function(config){
 
     var menu = Ext.create('Ext.menu.Menu', {
         items:[
-        {
-            text: 'Preferences',
-            iconCls:'icon-gear',
-            handler: function(){
-                var win = Ext.create("Compass.ErpApp.Organizer.PreferencesWindow",{});
-                win.show();
-                win.setup();
+            {
+                text:'Preferences',
+                iconCls:'icon-gear',
+                handler:function () {
+                    var win = Ext.create("Compass.ErpApp.Organizer.PreferencesWindow", {iconCls:'icon-gear'});
+                    win.show();
+                    win.setup();
+                }
+            },
+            {
+                text:'Profile',
+                iconCls:'icon-user',
+                handler:function () {
+                    var win = Ext.create("Ext.window.Window", {
+                        title:'Profile',
+                        iconCls:'icon-user',
+                        items:[
+                            {xtype:'shared_profilemanagementpanel', title:'', height:250}
+                        ]
+                    });
+                    win.show();
+                }
             }
-        }]
+        ]
     });
 
-    var toolbar = Ext.create("Ext.toolbar.Toolbar",{
-        items: [
-        {
-            text:'Menu',
-            iconCls:'icon-info',
-            menu:menu
-        }]
+    var toolbar = Ext.create("Ext.toolbar.Toolbar", {
+        items:[
+            {
+                text:'Menu',
+                iconCls:'icon-info',
+                menu:menu
+            }
+        ]
     });
 
     this.ToolBar = toolbar;
 
-    this.addToToolBar = function(item){
+    this.addToToolBar = function (item) {
         toolbar.add("|");
         toolbar.add(item);
     };
 
-    this.setupLogoutButton = function(){
+    this.setupLogoutButton = function () {
         toolbar.add("->");
         toolbar.add({
-            text: 'Logout',
+            text:'Logout',
             xtype:'button',
             iconCls:"icon-exit",
-            defaultAlign : "right",
-            'listeners': {
+            defaultAlign:"right",
+            'listeners':{
                 scope:this,
-                'click':function() {
-                    Ext.MessageBox.confirm('Confirm', 'Are you sure you want to logout?', function(btn){
-                        if(btn == 'no'){
+                'click':function () {
+                    Ext.MessageBox.confirm('Confirm', 'Are you sure you want to logout?', function (btn) {
+                        if (btn == 'no') {
                             return false;
                         }
-                        else
-                        if(btn == 'yes')
-                        {
+                        else if (btn == 'yes') {
                             var defaultLogoutUrl = '/session/sign_out';
-                            if(Compass.ErpApp.Utility.isBlank(this.layoutConfig) || Compass.ErpApp.Utility.isBlank(this.layoutConfig["logout_url"])){
+                            if (Compass.ErpApp.Utility.isBlank(this.layoutConfig) || Compass.ErpApp.Utility.isBlank(this.layoutConfig["logout_url"])) {
                                 window.location = defaultLogoutUrl;
                             }
-                            else{
+                            else {
                                 window.location = this.layoutConfig["logout_url"];
                             }
                         }
@@ -67,94 +81,93 @@ Compass.ErpApp.Organizer.Layout = function(config){
         });
     };
 
-    this.CenterPanel = Ext.create("Ext.Panel",{
+    this.CenterPanel = Ext.create("Ext.Panel", {
         id:'erp_app_viewport_center',
-        region : 'center',
-        margins : '0 0 0 0',
-        layout: 'card',
-        activeItem : 0,
+        region:'center',
+        margins:'0 0 0 0',
+        layout:'card',
+        activeItem:0,
         frame:false,
-        minsize : 300,
-        items : []
+        minsize:300,
+        items:[]
     });
 
-    this.NorthPanel = Ext.create("Ext.Panel",{
-        region : 'north',
+    this.NorthPanel = Ext.create("Ext.Panel", {
+        region:'north',
         height:29,
-        layout: 'anchor',
-        margins : '0 0 0 0',
-        cmargins : '0 0 0 0',
+        layout:'anchor',
+        margins:'0 0 0 0',
+        cmargins:'0 0 0 0',
         items:[toolbar]
     });
 
-    this.EastPanel = Ext.create("Ext.Panel",{
-        region : 'east',
-        hidden : true
+    this.EastPanel = Ext.create("Ext.Panel", {
+        region:'east',
+        hidden:true
     });
 
-    var southToolbar = Ext.create("Ext.toolbar.Toolbar",{
+    var southToolbar = Ext.create("Ext.toolbar.Toolbar", {
         items:[
-        "->",
-        {
-            xtype:"trayclock"
-        }
+            "->",
+            {
+                xtype:"trayclock"
+            }
         ]
     });
 
     this.SouthToolBar = southToolbar;
 
-    this.SouthPanel = Ext.create("Ext.Panel",{
-        region : 'south',
+    this.SouthPanel = Ext.create("Ext.Panel", {
+        region:'south',
         height:29,
-        layout: 'anchor',
-        margins : '0 0 0 0',
-        cmargins : '0 0 0 0',
+        layout:'anchor',
+        margins:'0 0 0 0',
+        cmargins:'0 0 0 0',
         items:[
-        southToolbar
+            southToolbar
         ]
     });
 
-    this.addApplication = function(menuPanel, components){
+    this.addApplication = function (menuPanel, components) {
         accordionMenuItems.push(menuPanel);
-        for(var i=0; i < components.length; i++){
+        for (var i = 0; i < components.length; i++) {
             this.CenterPanel.add(components[i]);
         }
     };
 
-    this.setup = function(){
+    this.setup = function () {
         this.WestPanel = {
-            region : 'west',
-            margins : '0 0 0 0',
-            cmargins : '0 0 0 0',
-            width : 200,
+            region:'west',
+            margins:'0 0 0 0',
+            cmargins:'0 0 0 0',
+            width:200,
             split:true,
-            collapsible: true,
-            layout: 'accordion',
+            collapsible:true,
+            layout:'accordion',
             items:accordionMenuItems
         };
 
         this.viewPort = Ext.create('Ext.container.Viewport', {
-            layout : 'border',
-            border : false,
-            items :
-            [
-            this.NorthPanel,
-            this.WestPanel,
-            this.CenterPanel,
-            this.EastPanel,
-            this.SouthPanel
+            layout:'border',
+            border:false,
+            items:[
+                this.NorthPanel,
+                this.WestPanel,
+                this.CenterPanel,
+                this.EastPanel,
+                this.SouthPanel
             ]
         });
     };
 };
 
-Compass.ErpApp.Organizer.Layout.setActiveCenterItem = function(id, loadRemoteData){
-    var comp = Ext.ComponentMgr.get('erp_app_viewport_center').query('#'+id).first();
+Compass.ErpApp.Organizer.Layout.setActiveCenterItem = function (id, loadRemoteData) {
+    var comp = Ext.ComponentMgr.get('erp_app_viewport_center').query('#' + id).first();
     Ext.ComponentMgr.get('erp_app_viewport_center').layout.setActiveItem(comp);
-    
-    if ( loadRemoteData === undefined || loadRemoteData ) {
+
+    if (loadRemoteData === undefined || loadRemoteData) {
         var hasLoad = ( (typeof comp.loadRemoteData) != 'undefined' );
-        if(hasLoad){
+        if (hasLoad) {
             comp.loadRemoteData();
         }
     }

data/public/javascripts/erp_app/organizer/preference_window.js

@@ -80,7 +80,7 @@ Ext.define("Compass.ErpApp.Organizer.PreferencesWindow",{
 
         config = Ext.apply({
             title:'Preferences',
-            height:300,
+            height:150,
             width:300,
             items:[this.form],
             layout:'fit'

data/public/javascripts/erp_app/{desktop/applications/audit_log_viewer → shared/audit_log}/audit_log_grid_panel.js

@@ -153,6 +153,7 @@ Ext.define('Compass.ErpApp.Desktop.Applications.AuditLogViewer.AuditLogGrid', {
         {
             header:'Audit Log Type',
             dataIndex:'audit_log_type',
+            sortable:false,
             width:200
         }
 

data/public/javascripts/erp_app/shared/audit_log/audit_log_tab_panel.js

@@ -0,0 +1,52 @@
+Ext.define("Compass.ErpApp.Desktop.Applications.AuditLogViewer.TabPanel", {
+    alias:'widget.audit_log_viewer-tabpanel',
+    extend:"Ext.tab.Panel",
+    autoScroll:true,
+    items:[{xtype:'audit_log_viewer-audit_log_grid'}],
+    plugins:Ext.create('Ext.ux.TabCloseMenu', {
+        extraItemsTail:[
+            '-',
+            {
+                text:'Closable',
+                checked:true,
+                hideOnClick:true,
+                handler:function (item) {
+                    currentItem.tab.setClosable(item.checked);
+                }
+            }
+        ],
+        listeners:{
+            aftermenu:function () {
+                currentItem = null;
+            },
+            beforemenu:function (menu, item) {
+                var menuitem = menu.child('*[text="Closable"]');
+                currentItem = item;
+                menuitem.setChecked(item.closable);
+            }
+        }
+    }),
+    listeners:{
+        auditLogEntrySelected:function (auditLogEntry) {
+            var audit_log_item_grid = Ext.create('Compass.ErpApp.Desktop.Applications.AuditLogViewer.AuditLogItemGrid',
+                {
+                    closable:true,
+                    listeners:{
+                        'afterrender':function(comp){
+                            comp.getStore().load({params:{audit_log_id:auditLogEntry.get('id')}});
+                        }
+                    }
+                }
+            );
+            this.add(audit_log_item_grid);
+            this.setActiveTab(audit_log_item_grid);
+        }
+    },
+    constructor:function (config) {
+        this.addEvents({
+            'auditLogEntrySelected':true
+        });
+
+        this.callParent([config]);
+    }
+});

data/public/javascripts/erp_app/shared/compass_ckeditor.js

@@ -1,3 +1,54 @@
+// This configuration was taken from http://docs.cksource.com/CKEditor_3.x/Howto/FCKeditor_HTML_Output
+// It changes the source formatting (indentation) back to FCKeditor formatting
+// indentationChars is set to 2 spaces
+Ext.onReady(function() {
+  try{
+    CKEDITOR.on( 'instanceReady', function( ev )
+    {
+        var writer = ev.editor.dataProcessor.writer; 
+        // The character sequence to use for every indentation step.
+        writer.indentationChars = '  ';
+     
+        var dtd = CKEDITOR.dtd;
+        // Elements taken as an example are: block-level elements (div or p), list items (li, dd), and table elements (td, tbody).
+        for ( var e in CKEDITOR.tools.extend( {}, dtd.$block, dtd.$listItem, dtd.$tableContent ) )
+        {
+            ev.editor.dataProcessor.writer.setRules( e, {
+                // Indicates that an element creates indentation on line breaks that it contains.
+                indent : false,
+                // Inserts a line break before a tag.
+                breakBeforeOpen : true,
+                // Inserts a line break after a tag.
+                breakAfterOpen : false,
+                // Inserts a line break before the closing tag.
+                breakBeforeClose : false,
+                // Inserts a line break after the closing tag.
+                breakAfterClose : true
+            });
+        }
+     
+        for ( var e in CKEDITOR.tools.extend( {}, dtd.$list, dtd.$listItem, dtd.$tableContent ) )
+        {
+            ev.editor.dataProcessor.writer.setRules( e, {           
+                indent : true,
+            });
+        }
+     
+        // You can also apply the rules to a single element.
+        ev.editor.dataProcessor.writer.setRules( 'table',
+        {       
+            indent : true
+        }); 
+     
+        ev.editor.dataProcessor.writer.setRules( 'form',
+        {       
+            indent : true
+        });     
+    });
+  }
+  catch(e){}
+});
+
 /**
  * @class Compass.ErpApp.Shared.CKeditor
  * @extends Ext.form.field.TextArea
@@ -8,7 +59,6 @@
  * @additional config options
  * ckEditorConfig - configuration for CkEditor Instance
  */
-
 Ext.define("Compass.ErpApp.Shared.CKeditor",{
     extend:"Ext.form.field.TextArea",
     alias:'widget.ckeditor',

data/public/javascripts/erp_app/shared/compass_codemirror.js

@@ -91,13 +91,6 @@ Ext.define("Compass.ErpApp.Shared.CodeMirror",{
         this.codeMirrorInstance.redo();
       },
       scope: this
-    }, {
-      text: 'Indent',
-      iconCls:'icon-arrow-right-blue',
-      handler: function() {
-        this.codeMirrorInstance.reindent();
-      },
-      scope: this
     }]);
 
     if(!Compass.ErpApp.Utility.isBlank(config['tbarItems'])){
@@ -108,7 +101,7 @@ Ext.define("Compass.ErpApp.Shared.CodeMirror",{
       config['tbar'] = tbarItems
     }
 
-    config = Ext.apply({
+    config = Ext.applyIf({
       layout:'fit',
       autoScroll:true,
       items: [{
@@ -135,6 +128,7 @@ Ext.define("Compass.ErpApp.Shared.CodeMirror",{
     this.initialConfig.codeMirrorConfig = Ext.apply({
       undoDepth: 3,
       lineNumbers: true,
+      lineWrapping: true,
       tabMode: "indent",
       onChange: function() {
         var code = self.codeMirrorInstance.getValue();

data/public/javascripts/erp_app/shared/configuration/configuration_panel.js

@@ -42,29 +42,31 @@ Ext.define("Compass.ErpApp.Shared.ConfigurationPanel",{
       listeners:{
         'itemclick':function(view, record, item, index, e){
           e.stopEvent();
-          var sharedConfigurationPanel = view.up('sharedconfigurationpanel');
-          var tabPanel = sharedConfigurationPanel.query('#configurationFormsTabPanel').first();
-          var itemId = 'configurationForm-'+record.get('categoryId');
-          var configurationForm = tabPanel.query('#'+itemId).first();
+          if(!record.isRoot()){
+			var sharedConfigurationPanel = view.up('sharedconfigurationpanel');
+	          var tabPanel = sharedConfigurationPanel.query('#configurationFormsTabPanel').first();
+	          var itemId = 'configurationForm-'+record.get('categoryId');
+	          var configurationForm = tabPanel.query('#'+itemId).first();
 
-          if(Ext.isEmpty(configurationForm)){
-            configurationForm = {
-              closable:true,
-              xtype:'sharedconfigurationform',
-              itemId:itemId,
-              title:record.get('text'),
-              configurationId:sharedConfigurationPanel.initialConfig.configurationId,
-              categoryId:record.get('categoryId'),
-              listeners:{
-                activate:function(form){
-                  form.setup();
-                }
-              }
-            };
-            tabPanel.add(configurationForm);
-            configurationForm = tabPanel.query('#'+itemId).first();
-          }
-          tabPanel.setActiveTab(configurationForm);
+	          if(Ext.isEmpty(configurationForm)){
+	            configurationForm = {
+	              closable:true,
+	              xtype:'sharedconfigurationform',
+	              itemId:itemId,
+	              title:record.get('text'),
+	              configurationId:sharedConfigurationPanel.initialConfig.configurationId,
+	              categoryId:record.get('categoryId'),
+	              listeners:{
+	                activate:function(form){
+	                  form.setup();
+	                }
+	              }
+	            };
+	            tabPanel.add(configurationForm);
+	            configurationForm = tabPanel.query('#'+itemId).first();
+	          }
+	          tabPanel.setActiveTab(configurationForm);
+			}
         }
       }
     };

data/public/javascripts/erp_app/shared/dynamic_editable_grid.js

@@ -16,6 +16,7 @@ Ext.define("Compass.ErpApp.Shared.DynamicEditableGrid",{
                     root: 'data',
                     messageProperty: 'message'
                 },
+                timeout: (config.timeout || 30000),
                 writer: {
                     type: 'json',
                     writeAllFields:true,

data/public/javascripts/erp_app/shared/dynamic_editable_grid_loader_panel.js

@@ -27,7 +27,11 @@ Ext.define("Compass.ErpApp.Shared.DynamicEditableGridLoaderPanel",{
                         validations:response.validations,
                         proxy:config.proxy,
                         listeners: config.grid_listeners,
-                        storeId: config['storeId']
+                        storeId: config['storeId'],
+                        selType: (config.selType || 'rowmodel'),
+                        multiSelect: (config.multiSelect || false),
+                        allowDeselect: (config.allowDeselect || false),
+                        timeout: (config.timeout || 30000)
                     });
                     self.down('shared_dynamiceditablegrid').getStore().load();
                 }