Uncommited changes synced

diff --git a/Pman.Tab.BAdminProject.bjs b/Pman.Tab.BAdminProject.bjs
index 37f8477..e3b3632 100644 (file)
--- a/Pman.Tab.BAdminProject.bjs
+++ b/Pman.Tab.BAdminProject.bjs
@@ -7,9 +7,7 @@
  "modOrder" : "300",
  "strings" : {
   "54e1d44609e3abed11f6e1eb6ae54988" : "Projects",
-  "d7778d0c64b6ba21494c97f77a66885a" : "Filter",
   "ec211f7c20af43e742bf2570c3cb84f9" : "Add",
-  "689202409e48743b914713f96d93947c" : "Value",
   "e57c636e4888ae64d98a590c6d530f25" : "Job No.",
   "bfa40db99e13ed2fe413ea8f1507cda9" : "Permission Group",
   "1a11b1adc359c03db0ca798a00e2632c" : "Opened",
@@ -20,8 +18,8 @@
  "items" : [
   {
    "xtype" : "Nest",
-   "$ xns" : "Roo.bootstrap.panel",
    "String region" : "center",
+   "$ xns" : "Roo.bootstrap.panel",
    "String title" : "Projects",
    "items" : [
     {
@@ -34,13 +32,6 @@
        "$ xns" : "Roo.bootstrap.layout",
        "* prop" : "center"
       },
-      {
-       "Number width" : 250,
-       "xtype" : "Region",
-       "$ xns" : "Roo.bootstrap.layout",
-       "* prop" : "west",
-       "Boolean split" : true
-      },
       {
        "xtype" : "Region",
        "Number height" : 50,
@@ -49,8 +40,8 @@
       },
       {
        "xtype" : "Content",
-       "String region" : "north",
        "$ xns" : "Roo.bootstrap.panel",
+       "String region" : "north",
        "items" : [
         {
          "String type" : "pills",
@@ -109,69 +100,13 @@
         }
        ]
       },
-      {
-       "listeners" : {
-        "activate" : "function (_self)\n{\n  this.grid.ds.load({});\n}"
-       },
-       "xtype" : "Grid",
-       "$ xns" : "Roo.bootstrap.panel",
-       "String region" : "west",
-       "items" : [
-        {
-         "listeners" : {
-          "render" : "function (_self)\n{\n    _this.grid = this;\n}"
-         },
-         "boolean striped" : true,
-         "xtype" : "Table",
-         "Boolean rowSelection" : true,
-         "$ xns" : "Roo.bootstrap",
-         "* prop" : "grid",
-         "items" : [
-          {
-           "listeners" : {
-            "selectionchange" : "function (_self)\n{\n    _this.addBtn.hide();\n    _this.removeBtn.hide();\n\n    var s = this.getSelected();\n    if (!s) { return; }\n\n    _this.preview.setUrl( baseURL + '/Preview/' + s.data.id + '.html'); \n    \n    if (s.data.is_approved) { \n        _this.removeBtn.show();\n    } else {\n        _this.addBtn.show();\n    }\n    \n}"
-           },
-           "Boolean singleSelect" : true,
-           "xtype" : "RowSelectionModel",
-           "$ xns" : "Roo.bootstrap.Table",
-           "* prop" : "sm"
-          },
-          {
-           "$ Array fields" : "[ 'filter' , 'value' ]",
-           "$ Array data" : "[\n    [ 'Job No:', '' ],\n    [ 'Office:', '' ],\n    [ 'Team Leader:', '' ],\n    [ 'Status:', '' ] \n]",
-           "boolean isLocal" : true,
-           "xtype" : "SimpleStore",
-           "$ xns" : "Roo.data",
-           "* prop" : "store"
-          },
-          {
-           "String header" : "Filter",
-           "String dataIndex" : "filter",
-           "xtype" : "ColumnModel",
-           "$ xns" : "Roo.grid",
-           "* prop" : "cm[]",
-           "Number sm" : 6
-          },
-          {
-           "String header" : "Value",
-           "String dataIndex" : "value",
-           "$ Function renderer" : "function(v,x,r) {\n    \n    return v;\n}",
-           "xtype" : "ColumnModel",
-           "$ xns" : "Roo.grid",
-           "* prop" : "cm[]",
-           "Number sm" : 6
-          }
-         ]
-        }
-       ]
-      },
       {
        "listeners" : {
         "activate" : "function (_self)\n{\n    this.grid.ds.load({});\n}"
        },
        "xtype" : "Grid",
-       "String region" : "center",
        "$ xns" : "Roo.bootstrap.panel",
+       "String region" : "center",
        "items" : [
         {
          "listeners" : {
@@ -194,9 +129,9 @@
            "* prop" : "sm"
           },
           {
+           "boolean isLocal" : true,
            "$ Array fields" : "[ 'filter' , 'value' ]",
            "$ Array data" : "[\n    [ 'Project:', '' ],\n    [ 'ER No.:', '' ],\n    [ 'School Code:', '' ],\n    [ 'District:', '' ] \n]",
-           "boolean isLocal" : true,
            "xtype" : "SimpleStore",
            "$ xns" : "Roo.data",
            "* prop" : "store"

diff --git a/Pman.Tab.BAdminProject.js b/Pman.Tab.BAdminProject.js
index 4a3b761..0556743 100644 (file)
--- a/Pman.Tab.BAdminProject.js
+++ b/Pman.Tab.BAdminProject.js
@@ -8,9 +8,7 @@ Pman.Tab.BAdminProject = new Roo.XComponent({
 
  _strings : {
   '54e1d44609e3abed11f6e1eb6ae54988' :"Projects",
-  'd7778d0c64b6ba21494c97f77a66885a' :"Filter",
   'ec211f7c20af43e742bf2570c3cb84f9' :"Add",
-  '689202409e48743b914713f96d93947c' :"Value",
   'e57c636e4888ae64d98a590c6d530f25' :"Job No.",
   'bfa40db99e13ed2fe413ea8f1507cda9' :"Permission Group",
   '1a11b1adc359c03db0ca798a00e2632c' :"Opened",
@@ -45,13 +43,6 @@ Pman.Tab.BAdminProject = new Roo.XComponent({
      xns : Roo.bootstrap.layout,
      '|xns' : 'Roo.bootstrap.layout'
     },
-    west : {
-     xtype : 'Region',
-     split : true,
-     width : 250,
-     xns : Roo.bootstrap.layout,
-     '|xns' : 'Roo.bootstrap.layout'
-    },
     north : {
      xtype : 'Region',
      height : 50,
@@ -132,91 +123,6 @@ Pman.Tab.BAdminProject = new Roo.XComponent({
        }
       ]
      },
-     {
-      xtype : 'Grid',
-      region : 'west',
-      listeners : {
-       activate : function (_self)
-        {
-          this.grid.ds.load({});
-        }
-      },
-      xns : Roo.bootstrap.panel,
-      '|xns' : 'Roo.bootstrap.panel',
-      grid : {
-       xtype : 'Table',
-       rowSelection : true,
-       striped : true,
-       listeners : {
-        render : function (_self)
-         {
-             _this.grid = this;
-         }
-       },
-       xns : Roo.bootstrap,
-       '|xns' : 'Roo.bootstrap',
-       store : {
-        xtype : 'SimpleStore',
-        data : [
-            [ 'Job No:', '' ],
-            [ 'Office:', '' ],
-            [ 'Team Leader:', '' ],
-            [ 'Status:', '' ] 
-        ],
-        fields : [ 'filter' , 'value' ],
-        isLocal : true,
-        xns : Roo.data,
-        '|xns' : 'Roo.data'
-       },
-       sm : {
-        xtype : 'RowSelectionModel',
-        singleSelect : true,
-        listeners : {
-         selectionchange : function (_self)
-          {
-              _this.addBtn.hide();
-              _this.removeBtn.hide();
-          
-              var s = this.getSelected();
-              if (!s) { return; }
-          
-              _this.preview.setUrl( baseURL + '/Preview/' + s.data.id + '.html'); 
-              
-              if (s.data.is_approved) { 
-                  _this.removeBtn.show();
-              } else {
-                  _this.addBtn.show();
-              }
-              
-          }
-        },
-        xns : Roo.bootstrap.Table,
-        '|xns' : 'Roo.bootstrap.Table'
-       },
-       cm : [
-        {
-         xtype : 'ColumnModel',
-         dataIndex : 'filter',
-         header : _this._strings['d7778d0c64b6ba21494c97f77a66885a'] /* Filter */,
-         sm : 6,
-         xns : Roo.grid,
-         '|xns' : 'Roo.grid'
-        },
-        {
-         xtype : 'ColumnModel',
-         dataIndex : 'value',
-         header : _this._strings['689202409e48743b914713f96d93947c'] /* Value */,
-         renderer : function(v,x,r) {
-             
-             return v;
-         },
-         sm : 6,
-         xns : Roo.grid,
-         '|xns' : 'Roo.grid'
-        }
-       ]
-      }
-     },
      {
       xtype : 'Grid',
       region : 'center',