erp_app 3.1.1 → 3.1.2

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

@@ -94,8 +94,13 @@ Ext.define("Compass.ErpApp.Shared.CKeditor",{
     },
 
     setupCkEditor : function(){
+        var me = this;
+
         Ext.applyIf(this.initialConfig.ckEditorConfig,{
             resize_enabled:false,
+            keystrokes:[
+                [CKEDITOR.CTRL + 83 /* S */, 'saveCommand']
+            ],
             base_path:'/javascripts/ckeditor/',
             toolbarStartupExpanded:true,
             enterMode:CKEDITOR.ENTER_BR,            
@@ -104,6 +109,18 @@ Ext.define("Compass.ErpApp.Shared.CKeditor",{
             extraPlugins:'' // removed codemirror plugin as it is unstable
         });
         var editor = CKEDITOR.replace(this.inputEl.id, this.initialConfig.ckEditorConfig);
+
+        editor.addCommand('saveCommand', {
+            exec : function(editor, data) {
+                me.fireEvent('save', me, me.getValue());
+                //event handler
+                return function(e){
+                    e = e || window.event;
+                    e.e_stopPropagation();
+                }
+            }
+        });
+
         editor.extjsPanel = this;
         this.ckEditorInstance = editor;
         this.setValue(this.defaultValue);

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

@@ -3,179 +3,191 @@
  * @extends Ext.Panel
  * Converts a panel into a code mirror editor with toolbar
  * @constructor
- * 
+ *
  * @author Dan Ungureanu - ungureanu.web@gmail.com / http://www.devweb.ro
  * @Enchnaced Russell Holmes
  */
 
 var CodeMirrorParsers = {
-  parser: {
-    sql: {
-      path:'plsql',
-      mode:'text/x-plsql'
-    },
-    rb:{
-      path:'ruby',
-      mode:'text/x-ruby'
-    },
-    rhtml:{
-      path:'ruby',
-      mode:'text/x-ruby'
+    parser:{
+        sql:{
+            path:'plsql',
+            mode:'text/x-plsql'
+        },
+        rb:{
+            path:'ruby',
+            mode:'text/x-ruby'
+        },
+        rhtml:{
+            path:'ruby',
+            mode:'text/x-ruby'
+        },
+        erb:{
+            path:'ruby',
+            mode:'text/x-ruby'
+        },
+        css:{
+            path:'css',
+            mode:'text/css'
+        },
+        js:{
+            path:'javascript',
+            mode:'text/javascript'
+        },
+        yml:{
+            path:'yaml',
+            mode:'text/x-yaml'
+        },
+        html:{
+            path:'htmlmixed',
+            mode:'text/html'
+        }
+    }
+};
+
+Ext.define("Compass.ErpApp.Shared.CodeMirror", {
+    extend:"Ext.panel.Panel",
+    alias:'widget.codemirror',
+    codeMirrorInstance:null,
+
+    initComponent:function () {
+        this.callParent(arguments);
+
+        this.addEvents(
+            /**
+             * @event save
+             * Fired when saving contents.
+             * @param {Compass.ErpApp.Shared.CodeMirror} codemirror This object
+             * @param (contents) contents needing to be saved
+             */
+            'save'
+        );
     },
-    erb:{
-      path:'ruby',
-      mode:'text/x-ruby'
+
+    constructor:function (config) {
+        var tbarItems = [];
+
+        if (!config['disableSave']) {
+            tbarItems.push({
+                text:'Save',
+                iconCls:'icon-save',
+                handler:this.save,
+                scope:this
+            });
+        }
+
+
+        tbarItems = tbarItems.concat([
+            {
+                text:'Undo',
+                iconCls:'icon-undo',
+                handler:function () {
+                    this.codeMirrorInstance.undo();
+                },
+                scope:this
+            },
+            {
+                text:'Redo',
+                iconCls:'icon-redo',
+                handler:function () {
+                    this.codeMirrorInstance.redo();
+                },
+                scope:this
+            }
+        ]);
+
+        if (!Compass.ErpApp.Utility.isBlank(config['tbarItems'])) {
+            tbarItems = tbarItems.concat(config['tbarItems']);
+        }
+
+        if (Compass.ErpApp.Utility.isBlank(config['disableToolbar']) || !config['disableToolbar']) {
+            config['tbar'] = tbarItems
+        }
+
+        config = Ext.applyIf({
+            layout:'fit',
+            autoScroll:true,
+            items:[
+                {
+                    xtype:'textareafield',
+                    readOnly:false,
+                    hidden:true,
+                    value:config['sourceCode']
+                }
+            ]
+        }, config);
+
+        this.callParent([config]);
     },
-    css: {
-      path:'css',
-      mode:'text/css'
+
+    onRender:function (ct, position) {
+        this.callParent(arguments);
+        this.on('afterlayout', this.setupCodeMirror, this, {
+            single:true
+        });
     },
-    js: {
-      path:'javascript',
-      mode:'text/javascript'
+
+    setupCodeMirror:function () {
+        var textAreaComp = this.query('textareafield')[0];
+        var self = this;
+        this.initialConfig.codeMirrorConfig = Ext.apply({
+            undoDepth:3,
+            lineNumbers:true,
+            extraKeys: {
+                "Ctrl-S": function(instance) { self.fireEvent('save', self, self.getValue()); },
+                "Cmd-S": function(instance) { self.fireEvent('save', self, self.getValue()); }
+            },
+            lineWrapping:true,
+            tabMode:"indent",
+            onChange:function () {
+                var code = self.codeMirrorInstance.getValue();
+                textAreaComp.setValue(code);
+            }
+        }, this.initialConfig.codeMirrorConfig);
+
+        //setup parser
+        var parserType = this.parser || 'html';
+        if (CodeMirrorParsers.parser[parserType]) {
+            var parserObj = CodeMirrorParsers.parser[parserType];
+            Compass.ErpApp.Utility.JsLoader.load('/javascripts/erp_app/codemirror/mode/' + parserObj.path + '/' + '' + parserObj.path + '.js', function () {
+                var editorConfig = Ext.applyIf(self.initialConfig.codeMirrorConfig, {
+                    mode:parserObj.mode
+                });
+                self.codeMirrorInstance = CodeMirror.fromTextArea(Ext.getDom(textAreaComp.id), editorConfig);
+                self.setValue(textAreaComp.getValue());
+                self.codeMirrorInstance.setCursor(1);
+            });
+        }
+        else {
+            self.codeMirrorInstance = CodeMirror.fromTextArea(Ext.getDom(textAreaComp.id), self.initialConfig.codeMirrorConfig);
+            self.codeMirrorInstance.setValue(textAreaComp.getValue());
+            self.codeMirrorInstance.setCursor(1);
+        }
     },
-    yml:{
-      path:'yaml',
-      mode:'text/x-yaml'
+
+    save:function () {
+        this.fireEvent('save', this, this.getValue());
     },
-    html: {
-      path:'htmlmixed',
-      mode:'text/html'
-    }
-  }
-};
 
-Ext.define("Compass.ErpApp.Shared.CodeMirror",{
-  extend:"Ext.panel.Panel",
-  alias:'widget.codemirror',
-  codeMirrorInstance : null,
-
-  initComponent: function() {
-    this.callParent(arguments);
-
-    this.addEvents(
-      /**
-         * @event save
-         * Fired when saving contents.
-         * @param {Compass.ErpApp.Shared.CodeMirror} codemirror This object
-         * @param (contents) contents needing to be saved
-         */
-      'save'
-      );
-  },
-
-  constructor : function(config){
-    var tbarItems = [];
-
-    if(!config['disableSave']){
-      tbarItems.push({
-        text: 'Save',
-        iconCls:'icon-save',
-        handler: this.save,
-        scope: this
-      });
-    }
+    setValue:function (value) {
+        this.codeMirrorInstance.setValue(value);
+    },
 
+    getValue:function () {
+        return this.codeMirrorInstance.getValue();
+    },
 
-    tbarItems = tbarItems.concat([{
-      text: 'Undo',
-      iconCls:'icon-undo',
-      handler: function() {
-        this.codeMirrorInstance.undo();
-      },
-      scope: this
-    }, {
-      text: 'Redo',
-      iconCls:'icon-redo',
-      handler: function() {
-        this.codeMirrorInstance.redo();
-      },
-      scope: this
-    }]);
-
-    if(!Compass.ErpApp.Utility.isBlank(config['tbarItems'])){
-      tbarItems = tbarItems.concat(config['tbarItems']);
-    }
+    getCursor:function () {
+        return this.codeMirrorInstance.getCursor();
+    },
 
-    if(Compass.ErpApp.Utility.isBlank(config['disableToolbar']) || !config['disableToolbar']){
-      config['tbar'] = tbarItems
-    }
+    getSelection:function () {
+        return this.codeMirrorInstance.getSelection();
+    },
 
-    config = Ext.applyIf({
-      layout:'fit',
-      autoScroll:true,
-      items: [{
-        xtype: 'textareafield',
-        readOnly: false,
-        hidden: true,
-        value: config['sourceCode']
-      }]
-    },config);
-        
-    this.callParent([config]);
-  },
-
-  onRender : function(ct, position){
-    this.callParent(arguments);
-    this.on('afterlayout', this.setupCodeMirror, this, {
-      single: true
-    });
-  },
-
-  setupCodeMirror : function(){
-    var textAreaComp = this.query('textareafield')[0];
-    var self = this;
-    this.initialConfig.codeMirrorConfig = Ext.apply({
-      undoDepth: 3,
-      lineNumbers: true,
-      lineWrapping: true,
-      tabMode: "indent",
-      onChange: function() {
-        var code = self.codeMirrorInstance.getValue();
-        textAreaComp.setValue(code);
-      }
-    },this.initialConfig.codeMirrorConfig);
-		
-    //setup parser
-    var parserType = this.parser || 'html';
-    if(CodeMirrorParsers.parser[parserType]){
-      var parserObj = CodeMirrorParsers.parser[parserType];
-      Compass.ErpApp.Utility.JsLoader.load('/javascripts/erp_app/codemirror/mode/'+parserObj.path+'/'+''+parserObj.path+'.js',function(){
-        var editorConfig = Ext.applyIf(self.initialConfig.codeMirrorConfig, {
-          mode:parserObj.mode
-          });
-        self.codeMirrorInstance = CodeMirror.fromTextArea(Ext.getDom(textAreaComp.id), editorConfig);
-        self.setValue(textAreaComp.getValue());
-        self.codeMirrorInstance.setCursor(1);
-      });
-    }
-    else{
-      self.codeMirrorInstance = CodeMirror.fromTextArea( Ext.getDom(textAreaComp.id), self.initialConfig.codeMirrorConfig);
-      self.codeMirrorInstance.setValue(textAreaComp.getValue());
-      self.codeMirrorInstance.setCursor(1);
+    insertContent:function (value) {
+        var lineNumber = this.codeMirrorInstance.getCursor().line;
+        var lineText = this.codeMirrorInstance.lineInfo(lineNumber).text;
+        this.codeMirrorInstance.setLine(lineNumber, (lineText + value));
     }
-  },
-
-  save : function(){
-    this.fireEvent('save', this, this.getValue());
-  },
-
-  setValue : function(value){
-    this.codeMirrorInstance.setValue(value);
-  },
-
-  getValue : function(){
-    return this.codeMirrorInstance.getValue();
-  },
-  getCursor : function(){
-    return this.codeMirrorInstance.getCursor();
-  },
-  getSelection : function() {
-    return this.codeMirrorInstance.getSelection();
-  },
-  insertContent : function(value){
-    var lineNumber = this.codeMirrorInstance.getCursor().line;
-    var lineText = this.codeMirrorInstance.lineInfo(lineNumber).text;
-    this.codeMirrorInstance.setLine(lineNumber,(lineText + value));
-  }
 });

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

@@ -670,7 +670,7 @@ Ext.define("Compass.ErpApp.Shared.FileManagerTree",{
       autoDestroy:true,
       split:true,
       autoScroll:true,
-      margins: '5 0 5 5',
+      //margins: '5 0 5 5',
       viewConfig: {
         loadMask: true,
         plugins: {

data/public/stylesheets/erp_app/shared/grid_cell.css

@@ -0,0 +1,23 @@
+.x-grid-cell-checkcolumn .x-grid-cell-inner {
+    padding-top: 4px;
+    padding-bottom: 2px;
+    line-height: 14px;
+}
+.x-grid-with-row-lines .x-grid-cell-checkcolumn .x-grid-cell-inner {
+    padding-top: 3px;
+}
+.x-grid-checkheader {
+    height: 14px;
+    background-image: url('/images/unchecked.gif');
+    background-position: 50% -2px;
+    background-repeat: no-repeat;
+    background-color: transparent;
+}
+
+.x-grid-checkheader-checked {
+    background-image: url('/images/checked.gif');
+}
+
+.x-grid-checkheader-editor .x-form-cb-wrap {
+    text-align: center;
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erp_app
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
@@ -1494,7 +1494,6 @@ files:
 - public/javascripts/erp_app/desktop/applications/file_manager/module.js
 - public/javascripts/erp_app/desktop/applications/scaffold/models_tree_panel.js
 - public/javascripts/erp_app/desktop/applications/scaffold/module.js
-- public/javascripts/erp_app/desktop/applications/scaffold/role_active_ext.js
 - public/javascripts/erp_app/desktop/applications/security_management/capabilities_panel.js
 - public/javascripts/erp_app/desktop/applications/security_management/capabilities_widget.js
 - public/javascripts/erp_app/desktop/applications/security_management/groups_effective_security.js
@@ -1675,6 +1674,7 @@ files:
 - public/javascripts/erp_app/shared/dynamic_editable_grid.js
 - public/javascripts/erp_app/shared/dynamic_editable_grid_loader_panel.js
 - public/javascripts/erp_app/shared/dynamic_forms/dynamic_form_fields.js
+- public/javascripts/erp_app/shared/Ext.ux.CheckColumn.js
 - public/javascripts/erp_app/shared/file_manager_tree.js
 - public/javascripts/erp_app/shared/file_upload/Ext.ux.panel.UploadPanel.js
 - public/javascripts/erp_app/shared/file_upload/plupload.flash.swf
@@ -4784,6 +4784,7 @@ files:
 - public/stylesheets/erp_app/mobile/applications/user_management/main.css
 - public/stylesheets/erp_app/mobile/mobile.css
 - public/stylesheets/erp_app/shared/compass-ext-all.css
+- public/stylesheets/erp_app/shared/grid_cell.css
 - public/stylesheets/erp_app/shared/hover_finger.css
 - public/stylesheets/extjs/resources/css/ext-all-access-debug.css
 - public/stylesheets/extjs/resources/css/ext-all-access.css
@@ -6818,7 +6819,6 @@ files:
 - app/controllers/erp_app/desktop/control_panel/desktop_management_controller.rb
 - app/controllers/erp_app/desktop/file_manager/base_controller.rb
 - app/controllers/erp_app/desktop/scaffold/base_controller.rb
-- app/controllers/erp_app/desktop/scaffold/role_controller.rb
 - app/controllers/erp_app/desktop/security_management/base_controller.rb
 - app/controllers/erp_app/desktop/security_management/capabilities_controller.rb
 - app/controllers/erp_app/desktop/security_management/groups_controller.rb
@@ -6866,11 +6866,6 @@ files:
 - app/models/widget.rb
 - app/observers/user_app_container_observer.rb
 - app/views/erp_app/desktop/base/index.erb
-- app/views/erp_app/desktop/scaffold/role/create.rhtml
-- app/views/erp_app/desktop/scaffold/role/edit.rhtml
-- app/views/erp_app/desktop/scaffold/role/new.rhtml
-- app/views/erp_app/desktop/scaffold/role/show.rhtml
-- app/views/erp_app/desktop/scaffold/role/update.rhtml
 - app/views/erp_app/login/index.erb
 - app/views/erp_app/mobile/base/index.erb
 - app/views/erp_app/mobile/login/index.erb
@@ -6946,6 +6941,11 @@ files:
 - lib/generators/cms_widget/templates/javascript/base.js.erb
 - lib/generators/cms_widget/templates/views/index.html.erb
 - lib/generators/cms_widget/USAGE
+- lib/generators/compass_ae_mobile/compass_ae_mobile_generator.rb
+- lib/generators/compass_ae_mobile/templates/controllers/controller_template.erb
+- lib/generators/compass_ae_mobile/templates/javascripts/main_template.erb
+- lib/generators/compass_ae_mobile/templates/views/view_template.erb
+- lib/generators/compass_ae_mobile/USAGE
 - lib/generators/desktop_application/desktop_application_generator.rb
 - lib/generators/desktop_application/templates/controllers/controller_template.erb
 - lib/generators/desktop_application/templates/INSTALL

data/app/controllers/erp_app/desktop/scaffold/role_controller.rb

@@ -1,23 +0,0 @@
-module ErpApp
-	module Desktop
-		module Scaffold
-			class RoleController < ErpApp::Desktop::Scaffold::BaseController
-			  active_ext SecurityRole do |options|
-				options[:inline_edit] = true
-				options[:use_ext_forms] = false
-				options[:ignore_associations] = true
-				options[:show_id] = true
-				options[:show_timestamps] = true
-				options[:only] = [
-				  {:description => {:required => true, :readonly => false}},
-				  {:internal_identifier => {:required => true, :readonly => false}},
-				  {:external_identifier => {:required => false, :readonly => false}}
-				]
-				options
-			  end
-			end
-		end
-	end
-end
-
-

data/app/views/erp_app/desktop/scaffold/role/create.rhtml

@@ -1,19 +0,0 @@
-<!--
- ActiveExt Scaffold Create
- This page is needed to allow the Create action to complete. It also provides
- the post-create refresh and window close functions. 
--->
-
-<script type="text/javascript">
-    function close_and_refresh(){
-        
-        parent.refresh_grid();
-         parent.close_window("create_detail_window");
-    }
-</script>
-<body onload="close_and_refresh() ;">
-    <h1>Created <%= @singular_name.capitalize%></h1>
-    <div align=RIGHT>
-    <input type="button" value="Close" onclick=close_and_refresh() />
-    </div>
-</body>

data/app/views/erp_app/desktop/scaffold/role/edit.rhtml

@@ -1,65 +0,0 @@
-<h1>Editing <%= @singular_name.capitalize %></h1>
-<% form_for @model, :url => { :action => 'update' }  do |form| %>
-  <div id='container'>
-    <table>
-      <% if @options[:show_id]==true %>
-        <tr>
-          <td style="text-align:right;">
-            <b>Id:</b>
-          </td>
-          <td>
-            <%=form.text_field :id, :disabled => true%>
-          </td>
-        </tr>
-      <% end %>
-      <% attribute_keys = @fields %>
-      <% attribute_keys.length.times do |attribute_key_id|
-        Rails.logger.debug("attribute_key_id:#{attribute_key_id}")
-      %>
-        <tr>
-          <td style="text-align:right;">
-            <b><% value=attribute_keys[attribute_key_id]
-              Rails.logger.debug("@labels:#{@labels}")
-              override_label_value= @labels[value.to_sym] unless @labels.nil?
-              if(override_label_value!=nil)
-                label_value=override_label_value
-              else
-                label_value= value.to_s.humanize
-              end %>
-              <%= label_value %>:</b>
-          </td>
-          <td>
-            <% if(@disabled_fields.include?(attribute_keys[attribute_key_id]))
-              disabled_flag=true
-            else
-              disabled_flag=false
-            end unless @disabled_fields.nil?
-          %>
-            <%= form.text_field attribute_keys[attribute_key_id], :disabled => disabled_flag  %>
-          </td>
-        </tr>
-      <% end %>
-      <% if @options[:show_timestamps]==true %>
-        <tr>
-          <td style="text-align:right;">
-            <b>Created At:</b>
-          </td>
-          <td>
-            <%= form.text_field :created_at, :disabled =>true %>
-          </td>
-        </tr>
-        <tr>
-          <td style="text-align:right;">
-            <b>Updated At:</b>
-          </td>
-          <td>
-            <%= form.text_field :updated_at, :disabled =>true %>
-          </td>
-        </tr>
-      <% end %>
-    </table>
-    <div style="text-align:right;">
-    <%=active_ext_close_button%> <input type="submit" value="Update"/>
-    </div>
-  </div>
-<% end %>

data/app/views/erp_app/desktop/scaffold/role/new.rhtml

@@ -1,41 +0,0 @@
-<h1>New <%= @singular_name.capitalize %></h1>
-<%= @disabled_fields%>
-<% form_for @model , :html => { :id => 'create_form'}, :url => { :action => 'create' }  do |form| %>
-
-  <div id='container'>
-    <table>
-      <% attribute_keys= @fields %>
-      <% attribute_keys.length.times do |attribute_key_id|
-        Rails.logger.debug("attribute_key_id:#{attribute_key_id}")
-      %>
-        <tr>
-          <td align=RIGHT>
-            <b><% value=attribute_keys[attribute_key_id]
-              Rails.logger.debug("@labels:#{@labels}")
-              override_label_value= @labels[value.to_sym] unless @labels.nil?
-              if(override_label_value!=nil)
-                label_value=override_label_value
-              else
-                label_value= value.to_s.humanize
-              end %>
-              <%= label_value %>:</b>
-          </td>
-          <td>
-            <% Rails.logger.debug("attributekey:#{attribute_keys[attribute_key_id]}")%>
-            <%if(@disabled_fields.include?(attribute_keys[attribute_key_id]))
-              disabled_flag=true
-            else
-              disabled_flag=false
-            end unless @disabled_fields.nil?
-          %>
-            <%= form.text_field attribute_keys[attribute_key_id], :disabled => disabled_flag  %>
-          </td>
-        </tr>
-      <% end %>
-    <% end %>
-  </table>
-  <div style="text-align:right;">
-    <input type="submit" value="Add" />
-    <%=active_ext_close_button%>
-  </div>
-</div>