erp_app 3.0.0 → 3.0.1

data/public/javascripts/erp_app/organizer/applications/crm/party_grid.js

@@ -11,19 +11,28 @@ Ext.define("Compass.ErpApp.Organizer.Applications.Crm.PartyGrid",{
              */
             'addpartybtnclick'
             );
+        this.addEvents(
+            /**
+             * @event editpartybtnclick
+             * Fires when add party button is clicked.
+             * @param {Ext.Panel} btn the button that was click.
+             * @param {Compass.ErpApp.PartyGrid} grid reference to the PartyGrid.
+             */
+            'editpartybtnclick'
+            );
 
         var grid = this;
         var config = this.initialConfig;
         var store = Ext.create('Ext.data.Store', {
-            fields:config['fields'],
-            autoLoad: true,
+            fields:config.fields,
+            autoLoad: false,
             autoSync: true,
             proxy: {
                 type: 'rest',
-                url:config['url'] || '/erp_app/organizer/crm/parties',
+                url:config.url || '/erp_app/organizer/crm/parties',
                 extraParams:{
                     party_name:null,
-                    party_type:config['partyType']
+                    party_type:config.partyType
                 },
                 reader: {
                     type: 'json',
@@ -42,7 +51,7 @@ Ext.define("Compass.ErpApp.Organizer.Applications.Crm.PartyGrid",{
                     exception: function(proxy, response, operation){
                         Ext.MessageBox.show({
                             title: 'REMOTE EXCEPTION',
-                            msg: 'Error Saving ' + config['partyType'],
+                            msg: 'Error Saving ' + config.partyType,
                             icon: Ext.MessageBox.ERROR,
                             buttons: Ext.Msg.OK
                         });
@@ -53,7 +62,7 @@ Ext.define("Compass.ErpApp.Organizer.Applications.Crm.PartyGrid",{
  
         var toolBar = Ext.create("Ext.toolbar.Toolbar",{
             items:[
-            '<span class="x-btn-inner">'+ this.initialConfig['partyType'] +' Name:</span>',
+            '<span class="x-btn-inner">'+ this.initialConfig.partyType +' Name:</span>',
             {
                 xtype:'textfield',
                 hideLabel:true,
@@ -96,21 +105,7 @@ Ext.define("Compass.ErpApp.Organizer.Applications.Crm.PartyGrid",{
                 handler: function(button) {
                     grid.fireEvent('addpartybtnclick', this, grid);
                 }
-            },
-            '|',
-            {
-                text: 'Delete',
-                xtype:'button',
-                iconCls: 'icon-delete',
-                handler: function(button) {
-                    var grid = button.findParentByType('partygrid');
-                    var rec = grid.getSelectionModel().selected.items[0];
-                    if (!rec) {
-                        return false;
-                    }
-                    grid.store.remove(rec);
-                }
-            }
+            }            
             ]
         });
 
@@ -159,7 +154,7 @@ Ext.define("Compass.ErpApp.Organizer.Applications.Crm.PartyGrid",{
         }
         ];
 
-        if(config['partyType'] == 'Organization'){
+        if(config.partyType == 'Organization'){
             columns = columns.concat([
             {
                 header: 'Description',
@@ -194,14 +189,6 @@ Ext.define("Compass.ErpApp.Organizer.Applications.Crm.PartyGrid",{
         }
         else{
             columns = columns.concat([
-            {
-                header: 'Suffix',
-                dataIndex: 'current_suffix',
-                editor: {
-                    xtype:'textfield'
-                },
-                width:120
-            },
             {
                 header: 'Title',
                 dataIndex: 'current_personal_title',
@@ -236,6 +223,14 @@ Ext.define("Compass.ErpApp.Organizer.Applications.Crm.PartyGrid",{
                 allowBlank:false,
                 width:120
             },
+            {
+                header: 'Suffix',
+                dataIndex: 'current_suffix',
+                editor: {
+                    xtype:'textfield'
+                },
+                width:120
+            },
             {
                 header: 'Nickname',
                 dataIndex: 'current_nickname',
@@ -255,7 +250,7 @@ Ext.define("Compass.ErpApp.Organizer.Applications.Crm.PartyGrid",{
             {
                 header: 'Passport Expiration Date',
                 dataIndex: 'current_passport_expire_date',
-                renderer: Ext.util.Format.dateRenderer('n/j/Y'),
+                renderer: Ext.util.Format.dateRenderer('m/d/Y'),
                 editor: {
                     xtype: 'datefield',
                     allowBlank: true
@@ -265,7 +260,7 @@ Ext.define("Compass.ErpApp.Organizer.Applications.Crm.PartyGrid",{
             {
                 header: 'DOB',
                 dataIndex: 'birth_date',
-                renderer: Ext.util.Format.dateRenderer('n/j/Y'),
+                renderer: Ext.util.Format.dateRenderer('m/d/Y'),
                 editor: {
                     xtype: 'datefield',
                     allowBlank: false
@@ -356,6 +351,7 @@ Ext.define("Compass.ErpApp.Organizer.Applications.Crm.PartyGrid",{
                 name:'current_passport_expire_date',
                 mapping:'business_party.current_passport_expire_date',
                 type: 'date',
+                dateFormat:'Y-m-d',
                 allowBlank:true
             },
             {
@@ -368,6 +364,7 @@ Ext.define("Compass.ErpApp.Organizer.Applications.Crm.PartyGrid",{
                 name:'birth_date',
                 mapping:'business_party.birth_date',
                 type: 'date',
+                dateFormat:'Y-m-d',
                 allowBlank:false
             },
 
@@ -404,9 +401,9 @@ Ext.define("Compass.ErpApp.Organizer.Applications.Crm.PartyGrid",{
         }
         ]);
 
-        this.editing = Ext.create('Ext.grid.plugin.RowEditing', {
-            clicksToMoveEditor: 1
-        });
+        //this.editing = Ext.create('Ext.grid.plugin.RowEditing', {
+        //    clicksToMoveEditor: 1
+        //});
 
         config = Ext.apply({
             columns:columns,
@@ -415,7 +412,7 @@ Ext.define("Compass.ErpApp.Organizer.Applications.Crm.PartyGrid",{
             frame: false,
             autoScroll:true,
             region:'center',
-            plugins:[this.editing],
+            //plugins:[this.editing],
             loadMask:true
         }, config);
         

data/public/javascripts/erp_app/organizer/applications/crm/userinfo.js

@@ -0,0 +1,215 @@
+/**
+ * UserInfo
+ */
+Ext.define("Compass.ErpApp.Organizer.Applications.Crm.UserInfo",{
+  extend:"Ext.panel.Panel",
+  alias:'widget.userinfo',
+
+  initComponent: function () {
+    var config = this.initialConfig;
+    var self = this;
+
+    this.setParams = function(params) {
+      this.partyId = params.partyId;
+      this.store.proxy.extraParams.party_id = params.partyId;
+    };
+    
+    var store = Ext.create('Ext.data.Store', {
+      proxy: {
+        type: 'ajax',
+        url : '/erp_app/organizer/crm/get_user',
+        reader: {
+          type: 'json',
+          root: 'data'
+        }
+      },
+      fields:[
+      {
+        name: 'id',
+        type: 'int'
+      },
+      {
+        name: 'username',
+        type: 'string'
+      },
+      {
+        name: 'email',
+        type: 'string'
+      },
+      {
+        name: 'activation_state',
+        type: 'string'
+      },
+      {
+        name: 'last_login_at',
+        type: 'string'
+      },
+      {
+        name: 'failed_logins_count',
+        type: 'string'
+      },
+      {
+        name: 'activation_token',
+        type: 'string'
+      }],
+      listeners:{
+        'load':function(store){
+            rec = store.getAt(0);
+            if (rec){
+              Ext.getCmp('editUserForm_'+this.partyId).getForm().loadRecord(rec);
+            }
+        }
+      }      
+    });
+
+    this.store = store;
+
+    this.callParent(arguments);
+  },
+
+  constructor: function(config) {
+    var self = this;
+
+    var actions = Ext.create('Ext.form.Panel',{
+      title: 'Actions',
+      region: 'north',
+      buttonAlign: 'left',
+      buttons: [{
+        text:'Activate User',
+        width: 125,
+        listeners:{
+          'click':function(button){
+            actions.getForm().submit({
+              url:'/erp_app/organizer/crm/activate/',
+              params:{
+                party_id: self.partyId,
+                activation_token: self.store.getAt(0).data.activation_token
+              },
+              waitMsg:'Activating User',
+              success:function(form, action){
+                var response =  Ext.decode(action.response.responseText);
+                Ext.Msg.alert("Status", response.message);
+              },
+              failure:function(form, action){
+                var message = 'Error activating user';
+                if(action.response != null){
+                  var response =  Ext.decode(action.response.responseText);
+                  message = response.message;
+                }
+                Ext.Msg.alert("Status", message);
+              }
+            });
+          }
+        }
+      },
+      {
+        text:'Reset Password',
+        width: 125,
+        listeners:{
+          'click':function(button){
+            actions.getForm().submit({
+              url:'/users/reset_password/',
+              params:{
+                party_id: self.partyId,
+                login: self.store.getAt(0).data.username
+              },
+              waitMsg:'Resetting Password',
+              success:function(form, action){
+                var response =  Ext.decode(action.response.responseText);
+                Ext.Msg.alert("Status", response.message);
+              },
+              failure:function(form, action){
+                var message = 'Error resetting password';
+                if(action.response != null){
+                  var response =  Ext.decode(action.response.responseText);
+                  message = response.message;
+                }
+                Ext.Msg.alert("Status", message);
+              }
+            });
+          }
+        }
+      }]
+    });
+
+    var edit_user = Ext.create('Ext.form.Panel',{
+      title: 'Edit User',
+      region: 'center',
+      id: 'editUserForm_'+self.partyId,
+      height: 100,
+      buttonAlign: 'left',
+      labelWidth: 110,
+      frame:false,
+      bodyStyle:'padding:5px 5px 0',
+      width: 425,
+      url:'/erp_app/organizer/crm/update_user',
+      defaults: {
+        width: 300
+      },
+      items: [{
+        xtype:'textfield',
+        fieldLabel:'Username',
+        allowBlank:false,
+        name:'username'
+      },
+      {
+        xtype:'textfield',
+        fieldLabel:'Email Address',
+        allowBlank:false,
+        name:'email',
+        vtype: 'email'
+      },
+      {
+        xtype:'displayfield',
+        fieldLabel:'Activation State',
+        name:'activation_state'
+      },
+      {
+        xtype:'displayfield',
+        fieldLabel:'Last Login At',
+        name:'last_login_at'
+      },
+      {
+        xtype:'displayfield',
+        fieldLabel:'Failed Logins',
+        name:'failed_logins_count'
+      }
+      ],
+      buttons: [{
+        text:'Save',
+        listeners:{
+          'click':function(button){
+            edit_user.getForm().submit({
+              params:{
+                party_id: self.partyId
+              },
+              waitMsg:'Updating User',
+              success:function(form, action){
+                var response =  Ext.decode(action.response.responseText);
+                Ext.Msg.alert("Status", response.message);
+              },
+              failure:function(form, action){
+                var message = 'Error resetting password';
+                if(action.response != null){
+                  var response =  Ext.decode(action.response.responseText);
+                  message = response.message;
+                }
+                Ext.Msg.alert("Status", message);
+              }
+            });
+          }
+        }
+      }]
+    });
+
+    config = Ext.apply({
+            title: 'User Info',
+            id: 'user_'+self.partyId,
+            layout:'border',
+            split: true,
+            items:[actions, edit_user]
+        }, config);
+
+    this.callParent([config]);
+  }
+});

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

@@ -84,9 +84,7 @@ Compass.ErpApp.Organizer.Layout = function(config){
         layout: 'anchor',
         margins : '0 0 0 0',
         cmargins : '0 0 0 0',
-        items:[
-        toolbar
-        ]
+        items:[toolbar]
     });
 
     this.EastPanel = Ext.create("Ext.Panel",{
@@ -124,15 +122,16 @@ Compass.ErpApp.Organizer.Layout = function(config){
     };
 
     this.setup = function(){
-        this.WestPanel = Ext.create("Ext.Panel",{
+        this.WestPanel = {
             region : 'west',
             margins : '0 0 0 0',
             cmargins : '0 0 0 0',
-            width : 300,
+            width : 200,
+            split:true,
             collapsible: true,
             layout: 'accordion',
             items:accordionMenuItems
-        });
+        };
 
         this.viewPort = Ext.create('Ext.container.Viewport', {
             layout : 'border',
@@ -150,14 +149,13 @@ Compass.ErpApp.Organizer.Layout = function(config){
 };
 
 Compass.ErpApp.Organizer.Layout.setActiveCenterItem = function(id, loadRemoteData){
-    Ext.ComponentMgr.get('erp_app_viewport_center').layout.setActiveItem(id);
-    var activeItem = Ext.ComponentMgr.get(id);
+    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 ) {
-        var hasLoad = ( (typeof activeItem.loadRemoteData) != 'undefined' );
-
+        var hasLoad = ( (typeof comp.loadRemoteData) != 'undefined' );
         if(hasLoad){
-            activeItem.loadRemoteData();
+            comp.loadRemoteData();
         }
     }
 

data/public/javascripts/erp_app/shared/active_ext/active_ext_grid.js

@@ -18,7 +18,6 @@ Ext.define("Compass.ErpApp.Shared.ActiveExt.ActiveExtGrid",{
     loadForm : function(id, action){
         var self = this;
         this.setWindowStatus('Loading form...');
-        var conn = new Ext.data.Connection();
         var formAction = null;
 
         switch(action){
@@ -30,7 +29,7 @@ Ext.define("Compass.ErpApp.Shared.ActiveExt.ActiveExtGrid",{
                 break;
         }
 
-        conn.request({
+        Ext.Ajax.request({
             url: this.initialConfig.modelUrl + '/' + action,
             method: 'POST',
             params:{

data/public/javascripts/erp_app/shared/active_ext/active_ext_grid_panel.js

@@ -1,5 +1,5 @@
 Ext.define("Compass.ErpApp.Shared.ActiveExt.ActiveExtGridPanel",{
-    extend:"Ext.Panel",
+    extend:"Ext.panel.Panel",
     alias:'widget.activeextgridpanel',
     setupGrid: function(){
         var self = this;
@@ -8,8 +8,7 @@ Ext.define("Compass.ErpApp.Shared.ActiveExt.ActiveExtGridPanel",{
         if(modelUrlLastChar == '/'){
             config['modelUrl'] = config['modelUrl'].substr(0, config['modelUrl'].length - 1);
         }
-        var conn = new Ext.data.Connection();
-        conn.request({
+        Ext.Ajax.request({
             url: config['modelUrl'] + '/setup',
             method: 'POST',
             params:config['params'],

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

@@ -47,10 +47,11 @@ Ext.define("Compass.ErpApp.Shared.CKeditor",{
         Ext.applyIf(this.initialConfig.ckEditorConfig,{
             resize_enabled:false,
             base_path:'/javascripts/ckeditor/',
-            toolbarStartupExpanded:false,
+            toolbarStartupExpanded:true,
+            enterMode:CKEDITOR.ENTER_BR,            
             shiftEnterMode:CKEDITOR.ENTER_P,
             baseFloatZIndex:20000,
-            extraPlugins:'codemirror'
+            extraPlugins:'' // removed codemirror plugin as it is unstable
         });
         var editor = CKEDITOR.replace(this.inputEl.id, this.initialConfig.ckEditorConfig);
         editor.extjsPanel = this;
@@ -70,10 +71,10 @@ Ext.define("Compass.ErpApp.Shared.CKeditor",{
                     var toolBoxEl = Ext.get(toolBoxDiv);
                     var displayValue = toolBoxEl.getStyle('display');
                     if(displayValue != 'none'){
-                        this.ckEditorInstance.execCommand( 'toolbarCollapse' );
-                        el.style.height = adjHeight - 70 + 'px';
+                        //this.ckEditorInstance.execCommand( 'toolbarCollapse' );
+                        el.style.height = adjHeight - 140 + 'px';
 						el.style.width  = adjWidth + 'px';
-                        this.ckEditorInstance.execCommand( 'toolbarCollapse' );
+                        //this.ckEditorInstance.execCommand( 'toolbarCollapse' );
                     }
                     else{
                         el.style.height = adjHeight - 70 + 'px';
@@ -82,7 +83,7 @@ Ext.define("Compass.ErpApp.Shared.CKeditor",{
 					
                 }
                 else{
-                    this.ckEditorInstance.config.height = adjHeight - 70;
+                    this.ckEditorInstance.config.height = adjHeight - 140;
                 }
             }
         }