erp_forms 2.0.2 → 2.0.3

data/lib/erp_forms/dynamic_form_field.rb

@@ -5,22 +5,23 @@ class DynamicFormField
 
   Field Types TODO
   special:
-  password
-  file upload
-
+  codemirror
+  file upload - use has_file_assets and plupload
+  test password field
+  
   complex (for future implementation):
   concatenated
   calculated
-  related
+  related with search ahead for relations with huge datasets
 =end
 
 #  options = {
 #    :fieldLabel => Field label text string
 #    :name => Field variable name string
-#    :allowblank => required true or false
+#    :allowBlank => required true or false
 #    :value => prepopulated default value string
-#    :readonly => disabled true or false
-#    :maxlength => maxLength integer
+#    :readOnly => disabled true or false
+#    :maxLength => maxLength integer
 #    :width => size integer
 #    :validation_regex => regex string
 #  }
@@ -37,6 +38,11 @@ class DynamicFormField
     DynamicFormField.basic_field('numberfield', options)
   end
 
+  def self.password(options={})
+    options[:inputType] = 'password'
+    DynamicFormField.basic_field('textfield', options)
+  end
+
   def self.datefield(options={})
     DynamicFormField.basic_field('datefield', options)
   end
@@ -47,21 +53,81 @@ class DynamicFormField
 
   def self.yesno(selections=[], options={})
     selections = [['yes', 'Yes'],['no', 'No']]
-    DynamicFormField.basic_field('combo', options, selections)
+    DynamicFormField.basic_field('combobox', options, selections)
+  end
+
+  # a combobox that dynamically pulls options from a related model
+  def self.related_combobox(model='', displayField = '', options={})
+    options[:forceSelection] = true if options[:forceSelection].nil?
+    options[:displayField] = displayField
+
+    options[:extraParams] = {
+      :model => model,
+      :displayField => displayField
+    }
+
+    options[:fields] = [
+      { :name => 'id' },
+      { :name => displayField }
+    ]
+
+    options[:url] = '/erp_forms/erp_app/desktop/dynamic_forms/forms/related_field' if options[:url].blank?
+
+    DynamicFormField.basic_field('related_combobox', options)
+  end
+
+  def self.ckeditor(options={})
+    options[:height] = 300 if options[:height].nil? 
+    options[:width] = 850 if options[:width].nil? 
+
+    if options[:ckEditorConfig].nil?
+      options[:ckEditorConfig] = {
+      #    :width => options[:width],
+      #    :height => options[:height],
+          :extraPlugins => 'compasssave,jwplayer',
+          :toolbar => [
+            ['Source','-','CompassSave','Preview','Print'],
+            ['Cut','Copy','Paste','PasteText','PasteFromWord'],
+            ['Undo','Redo'],
+            ['Find','Replace'],
+            ['SpellChecker','-','SelectAll'],
+            ['TextColor','BGColor'],
+            ['Bold','Italic','Underline','Strike'],
+            ['Subscript','Superscript','-','jwplayer'],
+            ['Table','NumberedList','BulletedList'],
+            ['Outdent','Indent','Blockquote'],
+            ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+            ['BidiLtr','BidiRtl'],
+            ['Link','Unlink','Anchor'],
+            ['HorizontalRule','SpecialChar','PageBreak'],
+            ['ShowBlocks','RemoveFormat'],
+            ['Styles','Format','Font','FontSize' ],
+            ['Maximize','-','About']
+          ]
+        }
+    end
+
+    DynamicFormField.basic_field('ckeditor', options)
   end
 
   ################
   # BASIC FIELDS #
-  ################  
+  ################
+  # ComboBox with a static store, if you need a dynamic store use DynamicFormField.related_combobox
   # selections is an array of tuples, i.e. [['AL', 'Alabama'],['AK', 'Alaska']] - [value, text]
   def self.combobox(selections=[], options={})
-    DynamicFormField.basic_field('combo', options, selections)
+    options[:forceSelection] = true if options[:forceSelection].nil?
+    DynamicFormField.basic_field('combobox', options, selections)
   end
 
   def self.textfield(options={})
     DynamicFormField.basic_field('textfield', options)
   end
 
+  def self.displayfield(options={})
+    DynamicFormField.basic_field('displayfield', options)
+  end
+
   def self.textarea(options={})
     options[:height] = 100 if options[:height].nil? 
     DynamicFormField.basic_field('textarea', options)
@@ -83,21 +149,27 @@ class DynamicFormField
         :fieldLabel => options[:fieldLabel],
         :name => options[:name],
         :value => options[:value],
-        :allowBlank => options[:allowblank],  
-        :readOnly => options[:readonly],
+        :allowBlank => options[:allowBlank],  
+        :readOnly => options[:readOnly],
         :width =>options[:width],
         :height => options[:height],
-        :labelWidth => options[:labelwidth]
+        :labelWidth => options[:labelWidth],
+        :display_in_grid => options[:display_in_grid]
     }
+
+    field[:displayField] = options[:displayField] unless options[:displayField].blank?
+    field[:extraParams] = options[:extraParams] unless options[:extraParams].blank?
+    field[:url] = options[:url] unless options[:url].blank?
+    field[:fields] = options[:fields] unless options[:fields].blank?
     
     field[:mapping] = options[:mapping] unless options[:mapping].blank?
-    field[:maxLength] = options[:maxlength] unless options[:maxlength].nil?
+    field[:maxLength] = options[:maxLength] unless options[:maxLength].nil?
     
     if selections and selections != []
-      field[:store] = selections.to_json
+      field[:store] = selections
     end
 
-    if options[:validation_regex] or options[:validator_function]
+    if !options[:validation_regex].blank? or !options[:validator_function].blank?
       field[:validateOnBlur] = true
     end
     
@@ -116,14 +188,15 @@ class DynamicFormField
         
     options[:fieldLabel] = '' if options[:fieldLabel].nil?
     options[:name] = '' if options[:name].nil?
-    options[:allowblank] = true if options[:allowblank].nil?
+    options[:allowBlank] = true if options[:allowBlank].nil?
     options[:value] = '' if options[:value].nil?
-    options[:readonly] = false if options[:readonly].nil?
-    options[:maxlength] = nil if options[:maxlength].nil?
+    options[:readOnly] = false if options[:readOnly].nil?
+    options[:maxLength] = nil if options[:maxLength].nil?
     options[:width] = 200 if options[:width].nil?
     options[:height] = nil if options[:height].nil?
     options[:validation_regex] = '' if options[:validation_regex].nil?
-    options[:labelwidth] = 75 if options[:labelwidth].nil?
+    options[:labelWidth] = 75 if options[:labelWidth].nil?
+    options[:display_in_grid] = true if options[:display_in_grid].nil?
     
     options
   end

data/lib/erp_forms/dynamic_grid_column.rb

@@ -4,7 +4,7 @@ class DynamicGridColumn
     field_hash.symbolize_keys!
     header = field_hash[:fieldLabel]
     type = DynamicGridColumn.convert_xtype_to_column_type(field_hash[:xtype])
-    data_index = field_hash[:name]
+    data_index = (field_hash[:dataIndex] ? field_hash[:dataIndex] : field_hash[:name])
     
     if type == 'date'
       renderer = "Ext.util.Format.dateRenderer('m/d/Y')"
@@ -17,15 +17,17 @@ class DynamicGridColumn
         \"type\":\"#{type}\",
         \"dataIndex\":\"#{data_index}\""
    
-    if options[:width]
-      col << ",\"width\":#{options[:width]}"
-    end
+    
+    col << ",\"width\":#{field_hash[:width]}" if field_hash[:width]
+
+    sortable = field_hash[:sortable].nil? ? true : field_hash[:sortable]
+    col << ",\"sortable\":#{sortable}"
 
     col += ",
         \"renderer\": #{renderer}" if renderer != ''
 
     if options[:editor]
-      readonly = field_hash[:readonly].blank? ? false : field_hash[:readonly]
+      readonly = field_hash[:readOnly].blank? ? false : field_hash[:readOnly]
       col += ",
       {
         \"xtype\": \"#{field_hash[:xtype]}\",

data/lib/erp_forms/engine.rb

@@ -16,6 +16,7 @@ module ErpForms
     engine = self
     config.to_prepare do
       ErpBaseErpSvcs.register_compass_ae_engine(engine)
+      ::ErpApp::Widgets::Loader.load_compass_ae_widgets(engine)
 
       #dynamic_attributes patch
       require "erp_forms/dynamic_attributes_patch"

data/lib/erp_forms/extensions/active_record/has_dynamic_forms.rb

@@ -14,10 +14,10 @@ module ErpForms
         		  
         		  include HasDynamicForms::InstanceMethods  
 
-				def set_default(form_id)
-				  DynamicForm.update_all({ :default => false }, conditions={ :model_name => self.class_name.to_s })
-				  DynamicForm.update_all({ :default => true }, conditions={ :id => form_id })
-				end	
+      				def set_default(form_id)
+      				  DynamicForm.update_all({ :default => false }, conditions={ :model_name => self.class_name.to_s })
+      				  DynamicForm.update_all({ :default => true }, conditions={ :id => form_id })
+      				end	
       		  end
 
       		end
@@ -55,7 +55,7 @@ module ErpForms
 
             # get all forms by type
             def forms
-      		  DynamicForm.find_all_by_model_name(self.class_name)
+      		    DynamicForm.find_all_by_model_name(self.class_name)
             end
 
             def set_default(internal_identifier)

data/lib/erp_forms/extensions/railties/action_view.rb

@@ -7,14 +7,17 @@ ActionView::Base.class_eval do
   #   :width => 'width of form in pixels'
   # }
   def render_dynamic_form(name, options={})
-    
-    form = DynamicForm.get_form(name.to_s, options[:internal_identifier]).to_extjs_widget(
+    output = raw '&nbsp<script type="text/javascript">'
+    output += raw "Compass.ErpApp.Utility.JsLoader.load(['/javascripts/erp_app/shared/dynamic_forms/dynamic_form_fields.js'], function(){"
+
+    output += raw DynamicForm.get_form(name.to_s, options[:internal_identifier]).to_extjs_widget(
                 { :url => build_widget_url(:new),
                   :widget_result_id => widget_result_id,
                   :width => options[:width] 
                 })
 
-    form
+    output += raw '});</script>'
+    output
   end
   
 end

data/lib/erp_forms/version.rb

@@ -2,7 +2,7 @@ module ErpForms
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/public/javascripts/erp_app/desktop/applications/dynamic_forms/dynamic_data_grid.js

@@ -1,6 +1,148 @@
 Ext.define("Compass.ErpApp.Desktop.Applications.DynamicForms.DynamicDataGridPanel",{
     extend:"Compass.ErpApp.Shared.DynamicEditableGridLoaderPanel",
     alias:'widget.dynamic_forms_DynamicDataGridPanel',
+
+    addCommentWindow : function(record_id, model_name, comment_div_id){
+        var commentForm = {
+            url: '/erp_forms/erp_app/desktop/dynamic_forms/comments/add',
+            xtype: 'form',
+            items: [{
+                xtype: 'textarea',
+                name: 'comment',
+                width: 800,
+                height: 400
+            }],
+            buttons:[{
+                text:'Submit',
+                listeners:{
+                  'click':function(button){
+                    var formPanel = button.findParentByType('form');
+                    //self.setWindowStatus('Adding Comment ...');
+                    formPanel.getForm().submit({
+                      params:{
+                        id:record_id,
+                        model_name:model_name
+                      },
+                      reset:false,
+                      success:function(form, action){
+                        //self.clearWindowStatus();
+                        var obj =  Ext.decode(action.response.responseText);
+                        if(obj.success){
+                            var randomnumber=Math.floor(Math.random()*1024)
+                            var target_div = 'new-comment-'+randomnumber;
+                            string = '<div id="'+target_div+'" class="comment">';
+                            string += '<i>by you, just now</i><br />';
+                            string += formPanel.getForm().findField('comment').getValue();
+                            string += '</div>';
+                            document.getElementById(comment_div_id).innerHTML += string;
+                            Ext.getCmp('commentWindow_'+model_name+record_id).close();
+                            codemirrorHighlight(target_div);
+                        }
+                        else{
+                          Ext.Msg.alert("Error", obj.msg);
+                        }
+                      },
+                      failure:function(form, action){
+                        //self.clearWindowStatus();
+                        var obj =  Ext.decode(action.response.responseText);
+                        if(Compass.ErpApp.Utility.isBlank(obj.message)){
+                          Ext.Msg.alert("Error", 'Error adding comment.');
+                        }
+                        else{
+                          Ext.Msg.alert("Error", obj.message);
+                        }
+                      }
+                    });
+                  }
+                }
+            }]
+        }
+
+        var commentWindow = Ext.create('Ext.window.Window',{
+            id: 'commentWindow_'+model_name+record_id,
+            title: 'Add Comment',
+            items: [commentForm],
+            autoDestroy:true
+        });
+
+        commentWindow.show();
+        
+    },
+
+    viewRecord : function(rec, gridpanel_id){
+        var self = this;
+        Ext.getCmp('westregionPanel').setWindowStatus('Getting data ...');
+        Ext.Ajax.request({
+            url: '/erp_forms/erp_app/desktop/dynamic_forms/data/get',
+            method: 'POST',
+            params:{
+                id:rec.get("id"),
+                model_name:rec.get("model_name")
+            },
+            success: function(response) {
+                Ext.getCmp('westregionPanel').clearWindowStatus();
+                var response_text = Ext.decode(response.responseText);
+                var center_region = self.findParentByType('dynamic_forms_centerregion');
+
+                var ticket_div_id = gridpanel_id+'_ticket';
+
+                string = '<div id="'+ticket_div_id+'" style="padding: 10px;">';
+                string += '<div class="metadata">';
+                string += 'Created by '+response_text.metadata.created_username+' at '+response_text.metadata.created_at+'<br/>';
+                string += 'Updated';
+                if (response_text.metadata.updated_username){
+                    string += ' by '+response_text.metadata.updated_username;                    
+                }
+                if (response_text.metadata.updated_at){
+                    string += ' at '+response_text.metadata.updated_at;                    
+                }
+                string += '</div>';
+                for(var index in response_text.data) {
+                    string += '<b>'+ index + ':</b> ' + response_text.data[index] + '<br />';
+                }
+                string += '</div>';
+
+                var comment_div_id = gridpanel_id+'_comments';
+
+                if (response_text.comments){
+                    string += '<div id="'+comment_div_id+'" class="comments"><h1>Comments ';
+                    string += '<a onclick="javascript: Ext.getCmp(\''+gridpanel_id+'\').addCommentWindow('+rec.get("id")+',\''+rec.get("model_name")+'\',\''+comment_div_id+'\');" href="#">Add Comment</a></h1>';
+
+                    Ext.each(response_text.comments, function(comment){
+                        string += '<div class="comment">';
+                        string += '<i>by '+comment.commentor_name+ ', '+comment.created_at+'</i><br />';
+                        string += comment.comment;
+                        string += '</div>';
+                    });
+                    
+                    string += '</div>';
+                }
+
+                var viewPanel = {
+                    xtype: 'panel',
+                    title: rec.get("model_name")+' '+rec.get("id"),
+                    closable: true,
+                    autoScroll: true,
+                    record: rec,
+                    html: string,
+                    items: [],
+                    listeners:{
+                        'afterrender':function(){
+                            codemirrorHighlight(ticket_div_id);
+                            codemirrorHighlight(comment_div_id);
+                        }
+                    }
+                }
+
+                center_region.workArea.add(viewPanel);
+                center_region.workArea.setActiveTab(center_region.workArea.items.length - 1);
+            },
+            failure: function(response) {
+                Ext.getCmp('westregionPanel').clearWindowStatus();
+                Ext.Msg.alert('Error', 'Error getting data');
+            }
+        });
+    },
     
     editRecord : function(rec, model_name){
         var self = this;
@@ -9,23 +151,28 @@ Ext.define("Compass.ErpApp.Desktop.Applications.DynamicForms.DynamicDataGridPane
             url: '/erp_forms/erp_app/desktop/dynamic_forms/forms/get',
             method: 'POST',
             params:{
-                id:rec.get("id"),
+                id:rec.get("form_id"),
+                record_id:rec.get("id"),
                 model_name:model_name,
                 form_action: 'update'
             },
             success: function(response) {
                 Ext.getCmp('westregionPanel').clearWindowStatus();
                 form_definition = Ext.decode(response.responseText);
-                var editRecordWindow = Ext.create("Ext.window.Window",{
-                    layout:'fit',
-                    title:'Update Record',
-                    y: 100, // this fixes chrome and safari rendering the window at the bottom of the screen
-                    plain: true,
-                    buttonAlign:'center',
-                    items: form_definition                            
-                });
-                Ext.getCmp('dynamic_form_panel').getForm().loadRecord(rec);                
-                editRecordWindow.show();  
+                if (form_definition.success == false){
+                    Ext.Msg.alert('Error', form_definition.error);
+                }else{
+                    var editRecordWindow = Ext.create("Ext.window.Window",{
+                        layout:'fit',
+                        title:'Update Record',
+                        y: 100, // this fixes chrome and safari rendering the window at the bottom of the screen
+                        plain: true,
+                        buttonAlign:'center',
+                        items: form_definition                            
+                    });
+                    Ext.getCmp('dynamic_form_panel_'+model_name).getForm().loadRecord(rec);                
+                    editRecordWindow.show();
+                }
             },
             failure: function(response) {
                 Ext.getCmp('westregionPanel').clearWindowStatus();
@@ -64,13 +211,18 @@ Ext.define("Compass.ErpApp.Desktop.Applications.DynamicForms.DynamicDataGridPane
     
     constructor : function(config) {
         config = Ext.apply({
-            id:'DynamicFormDataGridPanel',
+            id:config.id,
             //title:'Dynamic Data',
             editable:false,
             page:true,
             pageSize: 20,
             displayMsg:'Displaying {0} - {1} of {2}',
-            emptyMsg:'Empty'
+            emptyMsg:'Empty',
+            grid_listeners:{
+                'itemdblclick':function(view, record){
+                    Ext.getCmp(config.id).viewRecord(record, config.id);
+                }
+            }
         }, config);
 
         this.callParent([config]);

data/public/javascripts/erp_app/desktop/applications/dynamic_forms/module.js

@@ -18,8 +18,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.DynamicForms",{
             win = desktop.createWindow({
                 id: 'dynamic_forms',
                 title:'Dynamic Forms',
-                width:1150,
-                height:550,
+                maximized:true,
                 iconCls: 'icon-document',
                 shim:false,
                 animCollapse:false,

data/public/javascripts/erp_app/desktop/applications/dynamic_forms/west_region.js

@@ -130,7 +130,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.DynamicForms.WestRegion",{
           sectionId,
           response.responseText,
           [{
-            text: 'Insert Content Area',
+            text: 'Insert Content Area1',
             handler: function(btn){
               var codeMirror = btn.findParentByType('codemirror');
               Ext.MessageBox.prompt('New File', 'Please enter content area name:', function(btn, text){
@@ -152,12 +152,20 @@ Ext.define("Compass.ErpApp.Desktop.Applications.DynamicForms.WestRegion",{
 
   getDynamicData : function(record, title){
     var self = this;
+    dynamic_data = Ext.getCmp('centerRegionLayout_'+record.data.text);
+    if (dynamic_data){
+      this.centerRegion.workArea.setActiveTab(dynamic_data);
+      return;
+    }
+
     var centerRegionLayout = Ext.create("Ext.panel.Panel",{
+      id: 'centerRegionLayout_'+record.data.text,
       layout:'border',
       title: record.data.text + " Dynamic Data",
       closable:true,
       items:[
       {
+        id: record.data.text,
         xtype:'dynamic_forms_DynamicDataGridPanel',
         model_name:record.data.text,
         dataUrl: '/erp_forms/erp_app/desktop/dynamic_forms/data/index/'+record.data.text,
@@ -184,15 +192,19 @@ Ext.define("Compass.ErpApp.Desktop.Applications.DynamicForms.WestRegion",{
               success: function(response) {
                 self.clearWindowStatus();
                 form_definition = Ext.decode(response.responseText);
-                var newRecordWindow = Ext.create("Ext.window.Window",{
-                  layout:'fit',
-                  title:'New Record',
-                  y: 100, // this fixes chrome and safari rendering the window at the bottom of the screen
-                  plain: true,
-                  buttonAlign:'center',
-                  items: form_definition
-                });
-                newRecordWindow.show();
+                if (form_definition.success == false){
+                    Ext.Msg.alert('Error', form_definition.error);
+                }else{
+                  var newRecordWindow = Ext.create("Ext.window.Window",{
+                    layout:'fit',
+                    title:'New Record',
+                    y: 100, // this fixes chrome and safari rendering the window at the bottom of the screen
+                    plain: true,
+                    buttonAlign:'center',
+                    items: form_definition
+                  });
+                  newRecordWindow.show();
+                }
               },
               failure: function(response) {
                 self.clearWindowStatus();
@@ -290,7 +302,8 @@ Ext.define("Compass.ErpApp.Desktop.Applications.DynamicForms.WestRegion",{
             }
           }
           else if(record.data['isForm']){
-            self.getDynamicForm(record);
+            //self.getDynamicForm(record);
+            Ext.Msg.alert('Info', 'Form Builder not yet implemented');
           }
         },
         'itemcontextmenu':function(view, record, htmlItem, index, e){
@@ -383,7 +396,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.DynamicForms.WestRegion",{
     var layout = new Ext.Panel({
       layout: 'border',
       autoDestroy:true,
-      title:'Dynamic Forms',
+      title:'Dynamic Models & Forms',
       items: [this.sitesTree],
       tbar:{
         items:[
@@ -474,7 +487,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.DynamicForms.WestRegion",{
       id: 'westregionPanel',
       region:'west',
       split:true,
-      width:200,
+      width:175,
       collapsible:false
     }, config);
 

data/public/javascripts/erp_app/shared/dynamic_forms/dynamic_form_fields.js

@@ -0,0 +1,37 @@
+Ext.define("Compass.ErpApp.Shared.DynamicRelatedComboBox",{
+    extend:"Ext.form.field.ComboBox",
+    alias:'widget.related_combobox',
+    initComponent: function() {
+        //var config = this.initialConfig;
+        this.callParent(arguments);
+    },
+
+    constructor : function(config) {
+
+        config = Ext.apply({
+            width: config['width'],
+            loadingText:'Retrieving Options...',
+            displayField: config['displayField'],
+            valueField:'id',
+            triggerAction: 'all',
+            allowBlank: config['allowBlank'],
+            store: Ext.create('Ext.data.Store', {
+                fields:config['fields'],
+                //remoteSort:config['remoteSort'],
+                proxy: {
+                        type:'ajax',
+                        reader:{
+                            type:'json',
+                            root:'data'
+                        },
+                        extraParams: config['extraParams'],
+                        url: config['url']
+                    },
+                //storeId: config['storeId'],
+                autoLoad: true
+            })
+        }, config);
+
+        this.callParent([config]);
+    }
+});

data/public/stylesheets/erp_app/desktop/applications/dynamic_forms/comments.css

@@ -0,0 +1,15 @@
+.metadata{
+  margin-bottom: 5px;  
+}
+
+.comments{
+  padding: 10px;
+
+}
+
+.comment{
+  border: 1px solid black; 
+  padding: 5px; 
+  margin-top: 5px;
+}
+