erp_forms 2.0.6 → 2.1.0

data/db/data_migrations/{20120904191738_update_contact_form.rb → 20121026191738_update_contact_form.rb}

@@ -1,6 +1,9 @@
 class UpdateContactForm
   
   def self.up
+    model = DynamicFormModel.find_by_model_name('WebsiteInquiry')
+    model.create_role
+
     fields = []
 
     fields << DynamicFormField.textfield({:fieldLabel => 'First Name', :name => 'first_name', :width => 250, :allowBlank => false })
@@ -11,6 +14,7 @@ class UpdateContactForm
     d = DynamicForm.find_by_internal_identifier('contact_us')
     unless d.nil?
       d.definition = fields.to_json
+      d.msg_target = 'qtip'
       d.save    
     end    
   end

data/db/migrate/20110530193446_dynamic_forms.rb

@@ -3,6 +3,10 @@ class DynamicForms < ActiveRecord::Migration
     unless table_exists?(:dynamic_form_models)
       create_table :dynamic_form_models do |t|
         t.string :model_name
+        t.boolean :show_in_multitask, :default => false 
+        t.boolean :allow_comments, :default => true 
+        t.boolean :allow_files, :default => true 
+        t.string :file_security_default, :default => 'private'
 
         t.timestamps
       end
@@ -28,6 +32,14 @@ class DynamicForms < ActiveRecord::Migration
         t.string :model_name
         t.string :internal_identifier
         t.boolean :default
+        t.string :widget_action, :default => 'save' 
+        t.string :widget_email_recipients 
+        t.boolean :focus_first_field, :default => true 
+        t.boolean :submit_empty_text, :default => false 
+        t.string :msg_target, :default => 'qtip'
+        t.string :submit_button_label, :default => 'Submit'
+        t.string :cancel_button_label, :default => 'Cancel'
+        t.text :comment
 
         t.integer :created_by_id
         t.integer :updated_by_id

data/db/migrate/20121007022323_upgrade_dynamic_forms_table.rb

@@ -0,0 +1,31 @@
+class UpgradeDynamicFormsTable < ActiveRecord::Migration
+  def self.up
+    add_column :dynamic_form_models, :show_in_multitask, :boolean, :default => false unless columns(:dynamic_form_models).collect {|c| c.name}.include?('show_in_multitask')
+    add_column :dynamic_form_models, :allow_comments, :boolean, :default => true unless columns(:dynamic_form_models).collect {|c| c.name}.include?('allow_comments')
+    add_column :dynamic_form_models, :allow_files, :boolean, :default => true unless columns(:dynamic_form_models).collect {|c| c.name}.include?('allow_files')
+    add_column :dynamic_form_models, :file_security_default, :string, :default => 'private' unless columns(:dynamic_form_models).collect {|c| c.name}.include?('file_security_default')
+    add_column :dynamic_forms, :widget_action, :string, :default => 'save' unless columns(:dynamic_forms).collect {|c| c.name}.include?('widget_action')
+    add_column :dynamic_forms, :widget_email_recipients, :string unless columns(:dynamic_forms).collect {|c| c.name}.include?('widget_email_recipients')
+    add_column :dynamic_forms, :focus_first_field, :boolean, :default => true unless columns(:dynamic_forms).collect {|c| c.name}.include?('focus_first_field')
+    add_column :dynamic_forms, :submit_empty_text, :boolean, :default => false unless columns(:dynamic_forms).collect {|c| c.name}.include?('submit_empty_text')
+    add_column :dynamic_forms, :msg_target, :string, :default => 'qtip' unless columns(:dynamic_forms).collect {|c| c.name}.include?('msg_target')
+    add_column :dynamic_forms, :submit_button_label, :string, :default => 'Submit' unless columns(:dynamic_forms).collect {|c| c.name}.include?('submit_button_label')
+    add_column :dynamic_forms, :cancel_button_label, :string, :default => 'Cancel' unless columns(:dynamic_forms).collect {|c| c.name}.include?('cancel_button_label')
+    add_column :dynamic_forms, :comment, :text unless columns(:dynamic_forms).collect {|c| c.name}.include?('comment')
+  end
+
+  def self.down
+    remove_column :dynamic_form_models, :show_in_multitask if columns(:dynamic_form_models).collect {|c| c.name}.include?('show_in_multitask')
+    remove_column :dynamic_form_models, :file_security_default if columns(:dynamic_form_models).collect {|c| c.name}.include?('file_security_default')
+    remove_column :dynamic_form_models, :allow_files if columns(:dynamic_form_models).collect {|c| c.name}.include?('allow_files')
+    remove_column :dynamic_form_models, :allow_comments if columns(:dynamic_form_models).collect {|c| c.name}.include?('allow_comments')
+    remove_column :dynamic_forms, :widget_action if columns(:dynamic_forms).collect {|c| c.name}.include?('widget_action')
+    remove_column :dynamic_forms, :widget_email_recipients if columns(:dynamic_forms).collect {|c| c.name}.include?('widget_email_recipients')
+    remove_column :dynamic_forms, :focus_first_field if columns(:dynamic_forms).collect {|c| c.name}.include?('focus_first_field')
+    remove_column :dynamic_forms, :submit_empty_text if columns(:dynamic_forms).collect {|c| c.name}.include?('submit_empty_text')
+    remove_column :dynamic_forms, :msg_target if columns(:dynamic_forms).collect {|c| c.name}.include?('msg_target')
+    remove_column :dynamic_forms, :submit_button_label if columns(:dynamic_forms).collect {|c| c.name}.include?('submit_button_label')
+    remove_column :dynamic_forms, :cancel_button_label if columns(:dynamic_forms).collect {|c| c.name}.include?('cancel_button_label')
+    remove_column :dynamic_forms, :comment if columns(:dynamic_forms).collect {|c| c.name}.include?('comment')
+  end
+end

data/lib/erp_forms.rb

@@ -1,5 +1,9 @@
 #compass libraries
+require 'erp_base_erp_svcs'
 require 'erp_tech_svcs'
+require 'erp_app'
+
+require "friendly_id"
 
 require 'erp_forms/version'
 require 'erp_forms/dynamic_form_field'

data/lib/erp_forms/dynamic_form_field.rb

@@ -6,7 +6,6 @@ class DynamicFormField
   Field Types TODO
   special:
   codemirror
-  file upload - use has_file_assets and plupload
   test password field
   
   complex (for future implementation):
@@ -23,14 +22,13 @@ class DynamicFormField
 #    :readOnly => disabled true or false
 #    :maxLength => maxLength integer
 #    :width => size integer
-#    :validation_regex => regex string
 #  }
 
   ##################
   # SPECIAL FIELDS #
   ##################
   def self.email(options={})
-    options[:validation_regex] = "^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$"
+    options[:validator_function] = 'validateEmail(v)'
     DynamicFormField.basic_field('textfield', options)
   end
 
@@ -71,8 +69,6 @@ class DynamicFormField
       { :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
 
@@ -137,10 +133,19 @@ class DynamicFormField
     DynamicFormField.basic_field('checkbox', options)
   end
 
+  def self.filefield(options={})
+    DynamicFormField.basic_field('filefield', options)
+  end
+
+  def self.hiddenfield(options={})
+    DynamicFormField.basic_field('hiddenfield', options)
+  end
+
+  # alias
   def self.hidden(options={})
-    DynamicFormField.basic_field('hidden', options)
+    DynamicFormField.hiddenfield(options={})
   end
-  
+
   def self.basic_field(xtype, options={}, selections=[])
     options = DynamicFormField.set_default_field_options(options)
 
@@ -154,53 +159,51 @@ class DynamicFormField
         :width =>options[:width],
         :height => options[:height],
         :labelWidth => options[:labelWidth],
-        :display_in_grid => options[:display_in_grid]
+        :display_in_grid => options[:display_in_grid],
+        :searchable => options[:display_in_grid]
     }
 
+    field[:buttonText] = options[:buttonText] unless options[:buttonText].blank?
     field[:displayField] = options[:displayField] unless options[:displayField].blank?
+    field[:disabled] = options[:disabled] unless options[:disabled].nil?
+    field[:editable] = options[:editable] unless options[:editable].nil?
+    field[:emptyText] = options[:emptyText] unless options[:emptyText].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[:forceSelection] = options[:forceSelection] unless options[:forceSelection].nil?
+    field[:hidden] = options[:hidden] unless options[:hidden].nil?
+    field[:hideTrigger] = options[:hideTrigger] unless options[:hideTrigger].nil?
+    field[:hideMode] = options[:hideMode] unless options[:hideMode].blank?
+    field[:labelAlign] = options[:labelAlign] unless options[:labelAlign].blank?
     field[:mapping] = options[:mapping] unless options[:mapping].blank?
     field[:minLength] = options[:minLength] unless options[:minLength].nil?
     field[:maxLength] = options[:maxLength] unless options[:maxLength].nil?
     field[:minValue] = options[:minValue] unless options[:minValue].nil?
     field[:maxValue] = options[:maxValue] unless options[:maxValue].nil?
-    field[:hideTrigger] = options[:hideTrigger] unless options[:hideTrigger].nil?
-
-    if selections and selections != []
-      field[:store] = selections
-    end
-
-    if !options[:validation_regex].blank? or !options[:validator_function].blank?
-      field[:validateOnBlur] = true
-    end
-    
-    if options[:validation_regex] and options[:validation_regex] != ''
-      field[:validation_regex] = options[:validation_regex]
-    end
+    field[:msgTarget] = options[:msgTarget] unless options[:msgTarget].blank?
+    field[:regexText] = options[:regexText] unless options[:regexText].blank?
+    field[:url] = options[:url] unless options[:url].blank?
+    field[:vtype] = options[:vtype] unless options[:vtype].blank?
+    field[:validation_regex] = options[:validation_regex] unless options[:validation_regex].blank?
+    field[:validator_function] = options[:validator_function] unless options[:validator_function].blank?
 
-    if options[:validator_function] and options[:validator_function] != ''
-      field[:validator_function] = options[:validator_function]
-    end
+    field[:store] = selections if selections and selections != []    
     
     field
   end
   
   def self.set_default_field_options(options={})
-        
     options[:fieldLabel] = '' if options[:fieldLabel].nil?
     options[:name] = '' if options[:name].nil?
     options[:allowBlank] = true if options[:allowBlank].nil?
-    options[:value] = '' if options[:value].nil?
     options[:readOnly] = false if options[:readOnly].nil?
     options[:minLength] = nil if options[:minLength].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[:display_in_grid] = true if options[:display_in_grid].nil?
+    options[:searchable] = true if options[:searchable].nil?
     
     options
   end

data/lib/erp_forms/dynamic_grid_column.rb

@@ -14,8 +14,8 @@ class DynamicGridColumn
       :dataIndex => data_index,
       :sortable => sortable
     }
-   
-    col[:width] = field_hash[:width] if field_hash[:width]
+
+    col[:width] = field_hash[:width] unless field_hash[:width].nil?
     col[:renderer] = renderer unless renderer.blank?
 
     if field_hash[:editor]

data/lib/erp_forms/engine.rb

@@ -9,8 +9,10 @@ module ErpForms
     end
 	
     ActiveSupport.on_load(:active_record) do
+      include ErpForms::Extensions::ActiveRecord::ActsAsDynamicFormModel
       include ErpForms::Extensions::ActiveRecord::HasDynamicData
       include ErpForms::Extensions::ActiveRecord::HasDynamicForms
+      include ErpForms::Extensions::ActiveRecord::ActsAsCommentable
     end
 
     ErpBaseErpSvcs.register_as_compass_ae_engine(config, self)
@@ -19,6 +21,9 @@ module ErpForms
     config.to_prepare do
       #dynamic_attributes patch
       require "erp_forms/dynamic_attributes_patch"
+
+      # setup sunspot for all dynamic form models if we're using solr
+      DynamicFormModel.sunspot_setup_all if ($USE_SOLR_FOR_DYNAMIC_FORM_MODELS && ActiveRecord::Base.connection.table_exists?('dynamic_form_models'))
   	end
 	
   end

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

@@ -0,0 +1,33 @@
+module ErpForms
+  module Extensions
+    module ActiveRecord
+      module ActsAsCommentable
+        def self.included(base)
+          base.extend(ClassMethods)
+        end
+
+        module ClassMethods
+
+          def acts_as_commentable
+            has_many :comments, :as => :commented_record, :dependent => :destroy
+
+            extend ActsAsCommentable::SingletonMethods
+            include ActsAsCommentable::InstanceMethods
+          end
+
+        end
+
+        module SingletonMethods
+        end
+
+        module InstanceMethods
+
+          def add_comment(options={})
+            self.comments.create(options)
+          end
+
+        end
+      end #ActsAsCommentable
+    end #ActiveRecord
+  end #Extensions
+end #Knitkit

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

@@ -0,0 +1,80 @@
+module ErpForms
+  module Extensions
+    module ActiveRecord
+      module ActsAsDynamicFormModel
+
+          def self.included(base)
+            base.extend(ClassMethods)                     
+          end
+
+          module ClassMethods
+            
+            def acts_as_dynamic_form_model
+              include ActsAsDynamicFormModel::InstanceMethods  
+            end
+
+          end
+        
+          module InstanceMethods
+
+            def dynamic_model
+              self.respond_to?(:dynamic_form_model) ? dynamic_form_model : DynamicFormModel.find_by_model_name(self.class.name)
+            end
+
+            def role_iid
+              dynamic_model.role_iid
+            end
+
+            def role
+              dynamic_model.role
+            end
+
+            def allow_comments?
+              dynamic_model.allow_comments
+            end
+
+            def allow_files?
+              dynamic_model.allow_files
+            end
+
+            def file_security_default
+              dynamic_model.file_security_default
+            end
+
+            def show_in_multitask
+              dynamic_model.show_in_multitask
+            end
+
+            # handles both static and dynamic attributes
+            def assign_all_attributes(params, ignored_params=[])    
+              params.each do |k,v|
+                k = k.to_s
+                unless ignored_params.include?(k) or k == '' or k == '_'
+                  if self.attributes.include?(k)
+                    self.send(k + '=', v) 
+                  else
+                    if ['created_by','updated_by','created_at','updated_at','created_with_form_id','updated_with_form_id'].include?(k)
+                      key = k + '='
+                    else
+                      key = DynamicDatum::DYNAMIC_ATTRIBUTE_PREFIX + k + '='
+                    end
+                    
+                    self.data.send(key, v) 
+                  end
+                end
+              end
+
+              self
+            end
+
+            # handles both static and dynamic attributes
+            def save_all_attributes(params, ignored_params=[])
+              self.assign_all_attributes(params, ignored_params)
+              (self.valid? and self.save) ? self : nil
+            end
+
+          end 
+      end
+    end
+  end
+end

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

@@ -15,8 +15,8 @@ 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 })
+      				  DynamicForm.update_all({ :default => false }, { :model_name => self.name })
+      				  DynamicForm.update_all({ :default => true }, { :id => form_id })
       				end	
       		  end
 
@@ -59,8 +59,8 @@ module ErpForms
             end
 
             def set_default(internal_identifier)
-              DynamicForm.update_all('default=0', conditions="model_name=#{self.class.to_s}")
-              DynamicForm.update_all('default=1', conditions="model_name=#{self.class.to_s} AND internal_identifier=#{internal_identifier}")
+              DynamicForm.update_all({:default => false}, "model_name=#{self.class.to_s}")
+              DynamicForm.update_all({:default => true}, "model_name=#{self.class.to_s} AND internal_identifier=#{internal_identifier}")
             end
 
       		end	

data/lib/erp_forms/extensions/extensions.rb

@@ -2,5 +2,7 @@
 require 'erp_forms/extensions/railties/action_view'
 
 #active_record extensions
+require 'erp_forms/extensions/active_record/acts_as_commentable'
+require 'erp_forms/extensions/active_record/acts_as_dynamic_form_model'
 require 'erp_forms/extensions/active_record/has_dynamic_data'
 require 'erp_forms/extensions/active_record/has_dynamic_forms'

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

@@ -7,7 +7,7 @@ ActionView::Base.class_eval do
   #   :width => 'width of form in pixels'
   # }
   def render_dynamic_form(name, options={})
-    output = raw '&nbsp<script type="text/javascript">'
+    output = raw '&nbsp<script type="text/javascript">Ext.onReady(function() {'
     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(
@@ -16,7 +16,7 @@ ActionView::Base.class_eval do
                   :width => options[:width] 
                 })
 
-    output += raw '});</script>'
+    output += raw '}); });</script>'
     output
   end
   

data/lib/erp_forms/version.rb

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

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

@@ -3,7 +3,8 @@ Ext.define("Compass.ErpApp.Desktop.Applications.DynamicForms.CenterRegion",{
     alias:'widget.dynamic_forms_centerregion',
   
     constructor : function(config) {
-      this.workArea = new Ext.TabPanel({
+      this.workArea = Ext.create('Ext.tab.Panel',{
+          id: 'dynamic_formsTabPanel',
           autoDestroy:true,
           region:'center'
       });

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

@@ -1,3 +1,110 @@
+Ext.define("Compass.ErpApp.Desktop.Applications.DynamicForms.FileTree",{
+  extend: "Compass.ErpApp.Shared.FileManagerTree",
+  alias: 'widget.dynamic_forms_DynamicFormsFileTree',  
+  loadMask: true,
+  autoLoadRoot:false,
+  collapsible:false,
+  title:'Files',
+  rootText:'Files',    
+  allowDownload:true,
+  addViewContentsToContextMenu:false,
+  rootVisible:true,
+  multiSelect:true,
+  containerScroll: true,
+  listeners:{
+    'load':function(store){
+      store.getRootNode().expand();
+    },
+    'allowdelete':function(){
+      return true;
+    },
+    'allowupload':function(){
+      return true;
+    },
+    'itemclick':function(view, record, item, index, e){
+      e.stopEvent();
+      return false;
+    },
+    'fileDeleted':function(fileTreePanel, node){},
+    'fileUploaded':function(fileTreePanel, node){},
+    'downloadfile':function(fileTreePanel, node){
+      window.open("/download/"+node.data.text+"?path=" + node.data.downloadPath,'mywindow','width=400,height=200');
+      return false;
+    }
+  },
+
+  changeSecurityOnFile : function(node, secure, fileTree){
+      var msg = secure ? 'Securing file...' : 'Unsecuring file...';
+      var waitMsg = Ext.Msg.wait("Please Wait", msg);
+      Ext.Ajax.request({
+        url: '/erp_forms/erp_app/desktop/dynamic_forms/data/update_file_security',
+        method: 'POST',
+        params:{
+          path: node.get('id'),
+          secure: secure,
+          model_name: fileTree.extraPostData.model_name,
+          id: fileTree.extraPostData.id
+        },
+        success: function(response) {
+          var obj = Ext.decode(response.responseText);
+          if(obj.success){
+            waitMsg.hide();
+            if(secure){
+              node.set('iconCls', 'icon-document_lock');
+            }
+            else{
+              node.set('iconCls', 'icon-document');
+            }
+            node.set('isSecured',secure);
+            node.commit();
+          }
+          else{
+            Ext.Msg.alert('Error', 'Error securing file.');
+          }
+        },
+        failure: function(response) {
+          waitMsg.hide();
+          Ext.Msg.alert('Error', 'Error securing file.');
+        }
+      });
+  },
+
+  constructor:function (config) {
+    var self = this;
+
+    config = Ext.apply({
+      autoDestroy:true,
+      title: 'Files',
+      itemId: config.itemId,
+      region: config.region,
+      margins: 0,
+      autoScroll: true,
+      autoLoadRoot:false,
+      showNewFileMenuItem:false,
+      showNewFolderMenuItem:false,
+      showRenameMenuItem:false,
+      enableViewContents:false,
+      additionalContextMenuItems:[{
+        nodeType:'leaf',
+        text:'Update Security',
+        iconCls:'icon-document_lock',
+        listeners:{
+          scope:self,
+          'click':function(){
+            var node = self.selectedNode;
+            self.changeSecurityOnFile(node, !node.get('isSecured'), self);
+          }
+        }
+      }],
+      controllerPath:'/erp_forms/erp_app/desktop/dynamic_forms/data',
+      standardUploadUrl:'/erp_forms/erp_app/desktop/dynamic_forms/data/upload_file',
+      url:'/erp_forms/erp_app/desktop/dynamic_forms/data/get_files'
+    }, config);
+
+    this.callParent([config]);
+  }
+});
+
 Ext.define("Compass.ErpApp.Desktop.Applications.DynamicForms.DynamicDataGridPanel",{
     extend:"Compass.ErpApp.Shared.DynamicEditableGridLoaderPanel",
     alias:'widget.dynamic_forms_DynamicDataGridPanel',
@@ -17,7 +124,6 @@ Ext.define("Compass.ErpApp.Desktop.Applications.DynamicForms.DynamicDataGridPane
                 listeners:{
                   'click':function(button){
                     var formPanel = button.findParentByType('form');
-                    //self.setWindowStatus('Adding Comment ...');
                     formPanel.getForm().submit({
                       params:{
                         id:record_id,
@@ -25,25 +131,24 @@ Ext.define("Compass.ErpApp.Desktop.Applications.DynamicForms.DynamicDataGridPane
                       },
                       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 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();
+                            button.findParentByType('window').close();
                             codemirrorHighlight(target_div);
+                            Ext.getCmp('commentsPanel'+model_name+record_id).doLayout();
                         }
                         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.');
@@ -56,7 +161,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.DynamicForms.DynamicDataGridPane
                   }
                 }
             }]
-        }
+        };
 
         var commentWindow = Ext.create('Ext.window.Window',{
             id: 'commentWindow_'+model_name+record_id,
@@ -65,145 +170,224 @@ Ext.define("Compass.ErpApp.Desktop.Applications.DynamicForms.DynamicDataGridPane
             autoDestroy:true
         });
 
-        commentWindow.show();
-        
+        commentWindow.show();        
     },
 
-    viewRecord : function(rec, gridpanel_id){
+    viewRecord : function(rec, formPanel){
         var self = this;
-        Ext.getCmp('westregionPanel').setWindowStatus('Getting data ...');
+        var gridpanel_id = self.id;
+        var record_id = (Ext.isEmpty(rec.model_name) ? rec.get("id") : rec.id);
+        var model_name = (Ext.isEmpty(rec.model_name) ? rec.get("model_name") : rec.model_name);
+
+        // check and see if tab already open
+        var center_region = self.findParentByType('dynamic_forms_centerregion');
+        var tab = center_region.workArea.query('#'+model_name+'-'+record_id).first();
+        if (tab){
+            center_region.workArea.setActiveTab(center_region.workArea.items.length - 1);
+            return;    
+        }
+
+        Ext.getCmp('dynamic_forms_westregion').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")
+                id:record_id,
+                model_name:model_name
             },
             success: function(response) {
-                Ext.getCmp('westregionPanel').clearWindowStatus();
+                Ext.getCmp('dynamic_forms_westregion').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 />';
+                var leftPanelItems = [formPanel];
+
+                //comments
+                if (response_text.comments){
+                    var comment_div_id = gridpanel_id+'_comments';
+                    comments_string = '<div id="'+comment_div_id+'" class="comments">';
+                    Ext.each(response_text.comments, function(comment){
+                        comments_string += '<div class="comment">';
+                        comments_string += '<i>by '+comment.commentor_name+ ', '+comment.created_at+'</i><br />';
+                        comments_string += comment.comment;
+                        comments_string += '</div>';
+                    });
+                    comments_string += '</div>';
+
+                    var commentsPanel = {
+                        id: 'commentsPanel'+model_name+record_id,
+                        xtype: 'panel',
+                        title: 'Comments',
+                        html: comments_string,
+                        tbar: [{ 
+                            xtype: 'button', 
+                            text: 'Add Comment',
+                            iconCls: 'icon-add',
+                            listeners:{
+                              click: function(button){
+                                Ext.getCmp(gridpanel_id).addCommentWindow(record_id, model_name, comment_div_id);
+                              }
+                            }
+                        }]
+                    };
+                    leftPanelItems.push(commentsPanel);
                 }
-                string += '</div>';
 
-                var comment_div_id = gridpanel_id+'_comments';
+                var leftPanel = {
+                    xtype: 'panel',
+                    autoScroll: true,
+                    items: leftPanelItems,
+                    region: 'center'
+                };
 
-                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>';
+                var metaDataPanel = {
+                    xtype: 'form',
+                    title: 'MetaData',
+                    bodyPadding: 10,
+                    items:[
+                        {
+                            xtype: 'displayfield',
+                            fieldLabel: 'Created By',
+                            value: response_text.metadata.created_username
+                        },
+                        {
+                            xtype: 'displayfield',
+                            fieldLabel: 'Created At',
+                            value: response_text.metadata.created_at
+                        },
+                        {
+                            xtype: 'displayfield',
+                            fieldLabel: 'Updated By',
+                            value: response_text.metadata.updated_username
+                        },
+                        {
+                            xtype: 'displayfield',
+                            fieldLabel: 'Updated At',
+                            value: response_text.metadata.updated_at
+                        }
+                    ]
+                };
 
-                    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>';
+                var rightPanelItems = [metaDataPanel];
+
+                if (response_text.has_file_assets){
+                    var fileTree = Ext.create('Compass.ErpApp.Desktop.Applications.DynamicForms.FileTree', {
+                      width: 250,
+                      minHeight: 800,
+                      listeners:{
+                        'beforeload':function(store){
+                            store.getProxy().extraParams.id = record_id;
+                            store.getProxy().extraParams.model_name = model_name;
+                        },
+                        'load':function(store){
+                            store.getRootNode().expand();
+                        },
+                        'afterrender':function(panel){
+                            setTimeout(function(){ 
+                                panel.getStore().load();
+                            },100);
+                        }
+                      }
                     });
-                    
-                    string += '</div>';
+                    fileTree.extraPostData = {
+                        id: record_id,
+                        model_name: model_name
+                    };
+
+                    rightPanelItems.push(fileTree);
                 }
 
-                var viewPanel = {
+                var rightPanel = {
                     xtype: 'panel',
-                    title: rec.get("model_name")+' '+rec.get("id"),
+                    items: rightPanelItems,
+                    region: 'east',
+                    width: 250
+                };
+
+                var viewPanel = Ext.create('Ext.panel.Panel',{
+                    itemId: model_name+'-'+record_id,
+                    layout: 'border',
+                    title: model_name+' '+record_id,
                     closable: true,
                     autoScroll: true,
-                    record: rec,
-                    html: string,
-                    items: [],
+                    record: rec,                    
+                    items: [leftPanel, rightPanel],
                     listeners:{
-                        'afterrender':function(){
+                        'afterrender':function(panel){
                             codemirrorHighlight(ticket_div_id);
                             codemirrorHighlight(comment_div_id);
-                        }
+                            panel.query('dynamic_form_panel').first().addListener('afterupdate', function(){
+                                // update status bar with save message
+                                // reload grid
+                                var tabPanel = panel.findParentByType('tabpanel');
+                                tabPanel.query('#'+model_name).first().query('shared_dynamiceditablegrid').first().getStore().load({});
+                            });
+                        }                        
                     }
-                }
-
+                });
                 center_region.workArea.add(viewPanel);
+                viewPanel.query('form').first().getForm().loadRecord(response_text);
                 center_region.workArea.setActiveTab(center_region.workArea.items.length - 1);
             },
             failure: function(response) {
-                Ext.getCmp('westregionPanel').clearWindowStatus();
+                Ext.getCmp('dynamic_forms_westregion').clearWindowStatus();
                 Ext.Msg.alert('Error', 'Error getting data');
             }
         });
     },
-    
-    editRecord : function(rec, model_name){
+
+    editRecord : function(rec){
         var self = this;
-        Ext.getCmp('westregionPanel').setWindowStatus('Getting update form...');
+        Ext.getCmp('dynamic_forms_westregion').setWindowStatus('Getting update form...');
         Ext.Ajax.request({
             url: '/erp_forms/erp_app/desktop/dynamic_forms/forms/get',
             method: 'POST',
-            params:{
-                id:rec.get("form_id"),
-                record_id:rec.get("id"),
-                model_name:model_name,
+            params:{ // params can come from create response or grid store
+                id:(Ext.isEmpty(rec.model_name) ? rec.get("form_id") : rec.form_id),
+                record_id:(Ext.isEmpty(rec.model_name) ? rec.get("id") : rec.id),
+                model_name:(Ext.isEmpty(rec.model_name) ? rec.get("model_name") : rec.model_name),
                 form_action: 'update'
             },
-            success: function(response) {
-                Ext.getCmp('westregionPanel').clearWindowStatus();
-                form_definition = Ext.decode(response.responseText);
-                if (form_definition.success == false){
-                    Ext.Msg.alert('Error', form_definition.error);
+            success: function(response, options){
+                Ext.getCmp('dynamic_forms_westregion').clearWindowStatus();
+                formPanel = Ext.decode(response.responseText);
+                if (formPanel.success === false){
+                    Ext.Msg.alert('Error', formPanel.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();
+                    self.viewRecord(rec, formPanel);
                 }
             },
-            failure: function(response) {
-                Ext.getCmp('westregionPanel').clearWindowStatus();
+            failure: function(response, options){
+                Ext.getCmp('dynamic_forms_westregion').clearWindowStatus();
                 Ext.Msg.alert('Error', 'Error getting form');
             }
         });
-    },
+    },    
     
     deleteRecord : function(rec, model_name){
         var self = this;
-        Ext.getCmp('westregionPanel').setWindowStatus('Deleting record...');
+        Ext.getCmp('dynamic_forms_westregion').setWindowStatus('Deleting record...');
         Ext.Ajax.request({
             url: '/erp_forms/erp_app/desktop/dynamic_forms/data/delete',
             method: 'POST',
             params:{
                 id:rec.get("id"),
-                model_name:model_name
+                model_name:rec.get("model_name")
             },
             success: function(response) {
                 var obj =  Ext.decode(response.responseText);
                 if(obj.success){
-                    Ext.getCmp('westregionPanel').clearWindowStatus();
+                    Ext.getCmp('dynamic_forms_westregion').clearWindowStatus();
                     self.query('shared_dynamiceditablegrid')[0].store.load();
                 }
                 else{
                     Ext.Msg.alert('Error', 'Error deleting record');
-                    Ext.getCmp('westregionPanel').clearWindowStatus();
+                    Ext.getCmp('dynamic_forms_westregion').clearWindowStatus();
                 }
             },
             failure: function(response) {
-                Ext.getCmp('westregionPanel').clearWindowStatus();
+                Ext.getCmp('dynamic_forms_westregion').clearWindowStatus();
                 Ext.Msg.alert('Error', 'Error deleting record');
             }
         });
@@ -212,7 +396,6 @@ Ext.define("Compass.ErpApp.Desktop.Applications.DynamicForms.DynamicDataGridPane
     constructor : function(config) {
         config = Ext.apply({
             id:config.id,
-            //title:'Dynamic Data',
             editable:false,
             page:true,
             pageSize: 20,
@@ -220,7 +403,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.DynamicForms.DynamicDataGridPane
             emptyMsg:'Empty',
             grid_listeners:{
                 'itemdblclick':function(view, record){
-                    Ext.getCmp(config.id).viewRecord(record, config.id);
+                    Ext.getCmp(config.id).editRecord(record);
                 }
             }
         }, config);
@@ -228,4 +411,3 @@ Ext.define("Compass.ErpApp.Desktop.Applications.DynamicForms.DynamicDataGridPane
         this.callParent([config]);
     }
 });
-