worked on report table form Extjs part

workflow/engine/methods/bpmn/proxyReportTables.php

@@ -4,11 +4,28 @@ try
     G::LoadClass('processMap');
     $oProcessMap = new processMap(new DBConnection);
 
-    if ( isset($_GET['pid']) )
+    if(isset($_GET['pid']) && !isset($_GET['type'])){
-    {
+        $rows        = $oProcessMap->getExtReportTables($_GET['pid']);
-         $rows        = ExtreportTablesList($_GET['pid']);
     }
 
+    else if(isset($_GET['pid']) && $_GET['type'] == 'global')
+    {
+        $aTheFields = array();
+        $aTheFields = getDynaformsVars($_GET['pid'], false);
+        foreach ($aTheFields as $aField) {
+          $rows[]  = array('FIELD_UID'  => $aField['sName'] . '-' . $aField['sType'],
+                                     'FIELD_NAME' => $aField['sName']);
+        }
+    }
+    
+    else if(isset($_GET['pid']) && $_GET['type'] == 'grid'){
+        $aTheFields = array();
+        $aTheFields = getGridsVars($_GET['pid']);
+        foreach ($aTheFields as $aField) {
+          $rows[]  = array('FIELD_UID'  => $aField['sName'] . '-' . $aField['sXmlForm'],
+                                         'FIELD_NAME' => $aField['sName']);
+        }
+    }
 
     $result['totalCount'] = count($rows);
     $result['data'] = $rows;

workflow/engine/templates/bpmn/ProcessOptions.js

@@ -2036,8 +2036,11 @@ ProcessOptions.prototype.addReportTable= function(_5625)
             {
                 name: 'REP_TAB_TITLE',
                 type: 'string'
+            },
+            {
+                name: 'FIELD_NAME',
+                type: 'string'
             }
-            
        ]);
   
  var reportStore = new Ext.data.JsonStore({
@@ -2050,6 +2053,7 @@ ProcessOptions.prototype.addReportTable= function(_5625)
             url          : 'proxyReportTables?pid='+pro_uid
             })
           });
+  reportStore.load();
   
   var reportColumns = new Ext.grid.ColumnModel({
             columns: [
@@ -2111,7 +2115,6 @@ var reportForm =new Ext.FormPanel({
       buttonAlign: 'center',
 
                       items:[{
-
                               xtype: 'textfield',
                               fieldLabel: 'Title',
                               name: 'REP_TAB_TITLE',
@@ -2148,14 +2151,19 @@ var reportForm =new Ext.FormPanel({
                       onSelect: function(record, index) {
                                 //Show-Hide Format Type Field
                                 if(record.data.value == 'global')
-                                        {Ext.getCmp("fields").show();
+                                        {
+                                            Ext.getCmp("fields").show();
                                             Ext.getCmp("gridfields").hide();
                                         }
                                 else
-                                    {Ext.getCmp("gridfields").show();
+                                     {
+                                        Ext.getCmp("gridfields").show();
                                         Ext.getCmp("fields").hide();
-                                
                                      }
+                                var link = 'proxyReportTables?pid='+pro_uid+'&type='+record.data.value;
+                                reportStore.proxy.setUrl(link, true);
+                                reportStore.load();
+                                
                                 this.setValue(record.data[this.valueField || this.displayField]);
                                 this.collapse();
                       }
@@ -2169,19 +2177,15 @@ var reportForm =new Ext.FormPanel({
                                   xtype: 'multiselect',
                                   width:  150,
                                   mode: 'local',
-                               //   hidden: true,
+                                  editable:true,
-                                  editable:       false,
                                   fieldLabel: 'Fields',
                                   triggerAction: 'all',
                                   forceSelection: true,
-                                  //dataIndex : 'ENGINE',
+                                  dataIndex : 'FIELD_NAME',
                                   name: 'FIELDS',
-                                  store: new Ext.data.JsonStore({
+                                  valueField: 'FIELD_NAME',
-                                         fields : ['name', 'value'],
+                                  displayField: 'FIELD_NAME',
-                                         data   :  [
+                                  store: reportStore
-                                  
-                              
-                                ]})
                                  }]
           //displayField:  'name',
           //emptyText    : 'Select Format',
@@ -2216,6 +2220,21 @@ var reportForm =new Ext.FormPanel({
           }
       ]
   })
+var gridWindow = new Ext.Window({
+        title: 'New Report Table',
+        collapsible: false,
+        maximizable: true,
+        width: 450,
+        //autoHeight: true,
+        height: 400,
+        //layout: 'fit',
+        plain: true,
+        bodyStyle: 'padding:5px;',
+        buttonAlign: 'center',
+        items: reportGrid
+});
+gridWindow.show();
+
 
 var formWindow = new Ext.Window({
         title: 'New Report Table',