Pman.Dialog.MTrackTime.bjs

Pman.Dialog.MTrackTime.js

diff --git a/Pman.Dialog.MTrackTime.bjs b/Pman.Dialog.MTrackTime.bjs
index 336445e..4ccfab9 100644 (file)
--- a/Pman.Dialog.MTrackTime.bjs
+++ b/Pman.Dialog.MTrackTime.bjs
@@ -32,6 +32,13 @@
   "b2439dea1dd89e6f694df484214e57cf" : "Working on this",
   "f49f927095bb01b44c96d29c8c09f3a3" : "Assigned to  / Prioritized (all projects)"
  },
+ "named_strings" : {
+  "description_fieldLabel" : "b5a7adde1af5c87d7fd797b6245c2a39",
+  "project_id_name_emptyText" : "6a58f977f2b623b695a340766f2a6843",
+  "project_id_name_loadingText" : "1243daf593fa297e07ab03bf06d925af",
+  "project_id_name_qtip" : "24f27bda5dd2c488aa9bc7700ba98c34",
+  "project_id_name_fieldLabel" : "9e727fdd3aec8274f46685441900280d"
+ },
  "items" : [
   {
    "title" : "Time Manager",
@@ -42,14 +49,14 @@
    "items" : [
     {
      "xtype" : "LayoutRegion",
-     "tabPosition" : "top",
      "$ xns" : "Roo",
+     "tabPosition" : "top",
      "* prop" : "center"
     },
     {
      "region" : "center",
-     "xtype" : "NestedLayoutPanel",
      "title" : "Log Time",
+     "xtype" : "NestedLayoutPanel",
      "$ xns" : "Roo",
      "items" : [
       {
@@ -59,8 +66,8 @@
        "items" : [
         {
          "xtype" : "LayoutRegion",
-         "width" : 600,
          "$ xns" : "Roo",
+         "width" : 600,
          "split" : true,
          "* prop" : "west"
         },
@@ -85,9 +92,9 @@
          "listeners" : {
           "|activate" : "function() {\n    _this.timepanel = this;\n    if (_this.timegrid) {\n       // _this.grid.footer.onClick('first');\n    }\n}"
          },
+         "region" : "west",
          "fitToframe" : true,
          "background" : true,
-         "region" : "west",
          "title" : "cash_invoice_entry",
          "xtype" : "GridPanel",
          "fitContainer" : true,
@@ -96,7 +103,7 @@
          "items" : [
           {
            "listeners" : {
-            "|rowdblclick" : "function (_self, rowIndex, e)\n{\n    if (!_this.dialog) return;\n    _this.dialog.show( this.getDataSource().getAt(rowIndex), function() {\n        _this.grid.footer.onClick('first');\n    }); \n}\n",
+            "|rowdblclick" : "function (_self, rowIndex, e)\n{\n    if (!_this.dialog) { return; }\n    _this.dialog.show( this.getDataSource().getAt(rowIndex), function() {\n        _this.grid.footer.onClick('first');\n    }); \n}\n",
             "|render" : "function() \n{\n    _this.timegrid = this; \n    //_this.dialog = Pman.Dialog.FILL_IN\n    if (_this.timepanel.active) {\n      // this.footer.onClick('first');\n    }\n}"
            },
            "autoExpandColumn" : "activity_ref",
@@ -149,8 +156,8 @@
                  "items" : [
                   {
                    "$ url" : "baseURL + '/Roo/Person.php'",
-                   "method" : "GET",
                    "xtype" : "HttpProxy",
+                   "method" : "GET",
                    "$ xns" : "Roo.data",
                    "* prop" : "proxy"
                   },
@@ -181,8 +188,8 @@
                 "beforeload" : "function (This, params)\n{\n   if (_this.personSelect.getValue()) {\n        params.person_id = _this.personSelect.getValue();\n    } else {\n        params.person_id = Pman.Login.authUser.id;\n    }\n    \n    \n}"
                },
                "$ url" : "baseURL + '/Roo/cash_invoice_entry.php'",
-               "xtype" : "HttpProxy",
                "method" : "GET",
+               "xtype" : "HttpProxy",
                "$ xns" : "Roo.data",
                "* prop" : "proxy"
               },
@@ -199,8 +206,8 @@
             },
             {
              "xtype" : "ColumnModel",
-             "header" : "Time",
              "width" : 100,
+             "header" : "Time",
              "$ renderer" : "function(v,x,r) { \n    var s = r.data.qtyvalue;\n    var end = v.add(Date.HOUR, s);\n    return String.format('{0} {1}-{2}',\n         v.format('D'), v.format('H:i'), end.format('H:i') );\n}",
              "$ xns" : "Roo.grid",
              "* prop" : "colModel[]",
@@ -208,8 +215,8 @@
             },
             {
              "xtype" : "ColumnModel",
-             "header" : "Ticket",
              "width" : 200,
+             "header" : "Ticket",
              "$ renderer" : "function(v) { return String.format('{0}', v ? v.format('d/M/Y') : ''); }",
              "$ xns" : "Roo.grid",
              "* prop" : "colModel[]",
@@ -217,8 +224,8 @@
             },
             {
              "xtype" : "ColumnModel",
-             "header" : "Notes",
              "width" : 300,
+             "header" : "Notes",
              "$ renderer" : "function(v) { return String.format('{0}', v ? v.format('d/M/Y') : ''); }",
              "$ xns" : "Roo.grid",
              "* prop" : "colModel[]",
@@ -254,9 +261,9 @@
              "listeners" : {
               "|activate" : "function() {\n    _this.queuepanel = this;\n    if (_this.queuegrid) {\n        //_this.queuegrid.footer.onClick('first');\n    }\n}"
              },
+             "region" : "center",
              "fitToframe" : true,
              "background" : true,
-             "region" : "center",
              "title" : "mtrack_ticket",
              "xtype" : "GridPanel",
              "fitContainer" : true,
@@ -319,8 +326,8 @@
                      "items" : [
                       {
                        "$ url" : "baseURL + '/Roo/Projects.php'",
-                       "method" : "GET",
                        "xtype" : "HttpProxy",
+                       "method" : "GET",
                        "$ xns" : "Roo.data",
                        "* prop" : "proxy"
                       },
@@ -348,8 +355,8 @@
                  "items" : [
                   {
                    "$ url" : "baseURL + '/Roo/mtrack_ticket.php'",
-                   "method" : "GET",
                    "xtype" : "HttpProxy",
+                   "method" : "GET",
                    "$ xns" : "Roo.data",
                    "* prop" : "proxy"
                   },
@@ -366,8 +373,8 @@
                 },
                 {
                  "xtype" : "ColumnModel",
-                 "width" : 200,
                  "header" : "Summary",
+                 "width" : 200,
                  "$ renderer" : "function(v) { return String.format('{0}', v); }",
                  "$ xns" : "Roo.grid",
                  "* prop" : "colModel[]",
@@ -457,8 +464,8 @@
                    "items" : [
                     {
                      "$ url" : "baseURL + '/Roo/Projects.php'",
-                     "method" : "GET",
                      "xtype" : "HttpProxy",
+                     "method" : "GET",
                      "$ xns" : "Roo.data",
                      "* prop" : "proxy"
                     },
@@ -543,8 +550,8 @@
     },
     {
      "region" : "center",
-     "xtype" : "NestedLayoutPanel",
      "title" : "Plan Time",
+     "xtype" : "NestedLayoutPanel",
      "$ xns" : "Roo",
      "items" : [
       {
@@ -569,9 +576,9 @@
          "listeners" : {
           "|activate" : "function() {\n    _this.openpanel = this;\n    if (_this.opengrid) {\n   //    _this.opengrid.footer.onClick('first');\n    }\n}"
          },
+         "region" : "west",
          "fitToframe" : true,
          "background" : false,
-         "region" : "west",
          "title" : "mtrack_ticket",
          "xtype" : "GridPanel",
          "fitContainer" : true,
@@ -629,8 +636,8 @@
                  "items" : [
                   {
                    "$ url" : "baseURL + '/Roo/mtrack_ticket.php'",
-                   "method" : "GET",
                    "xtype" : "HttpProxy",
+                   "method" : "GET",
                    "$ xns" : "Roo.data",
                    "* prop" : "proxy"
                   },
@@ -658,8 +665,8 @@
              "items" : [
               {
                "$ url" : "baseURL + '/Roo/mtrack_ticket.php'",
-               "method" : "GET",
                "xtype" : "HttpProxy",
+               "method" : "GET",
                "$ xns" : "Roo.data",
                "* prop" : "proxy"
               },
@@ -676,8 +683,8 @@
             },
             {
              "xtype" : "ColumnModel",
-             "width" : 200,
              "header" : "Summary",
+             "width" : 200,
              "$ renderer" : "function(v) { return String.format('{0}', v); }",
              "$ xns" : "Roo.grid",
              "* prop" : "colModel[]",
@@ -691,9 +698,9 @@
          "listeners" : {
           "|activate" : "function() {\n    _this.openpanel = this;\n    if (_this.opengrid) {\n   //    _this.opengrid.footer.onClick('first');\n    }\n}"
          },
+         "region" : "center",
          "fitToframe" : true,
          "background" : false,
-         "region" : "center",
          "title" : "mtrack_ticket",
          "xtype" : "GridPanel",
          "fitContainer" : true,
@@ -751,8 +758,8 @@
                  "items" : [
                   {
                    "$ url" : "baseURL + '/Roo/mtrack_ticket.php'",
-                   "method" : "GET",
                    "xtype" : "HttpProxy",
+                   "method" : "GET",
                    "$ xns" : "Roo.data",
                    "* prop" : "proxy"
                   },
@@ -780,8 +787,8 @@
              "items" : [
               {
                "$ url" : "baseURL + '/Roo/mtrack_ticket.php'",
-               "method" : "GET",
                "xtype" : "HttpProxy",
+               "method" : "GET",
                "$ xns" : "Roo.data",
                "* prop" : "proxy"
               },
@@ -798,8 +805,8 @@
             },
             {
              "xtype" : "ColumnModel",
-             "width" : 200,
              "header" : "Summary",
+             "width" : 200,
              "$ renderer" : "function(v) { return String.format('{0}', v); }",
              "$ xns" : "Roo.grid",
              "* prop" : "colModel[]",

diff --git a/Pman.Dialog.MTrackTime.js b/Pman.Dialog.MTrackTime.js
index a9e8029..c289fb4 100644 (file)
--- a/Pman.Dialog.MTrackTime.js
+++ b/Pman.Dialog.MTrackTime.js
@@ -33,6 +33,13 @@ Pman.Dialog.MTrackTime = {
   'b2439dea1dd89e6f694df484214e57cf' :"Working on this",
   'f49f927095bb01b44c96d29c8c09f3a3' :"Assigned to  / Prioritized (all projects)"
  },
+ _named_strings : {
+  'description_fieldLabel' : 'b5a7adde1af5c87d7fd797b6245c2a39' /* Description */ ,
+  'project_id_name_emptyText' : '6a58f977f2b623b695a340766f2a6843' /* Select Project */ ,
+  'project_id_name_loadingText' : '1243daf593fa297e07ab03bf06d925af' /* Searching... */ ,
+  'project_id_name_qtip' : '24f27bda5dd2c488aa9bc7700ba98c34' /* Select Projects */ ,
+  'project_id_name_fieldLabel' : '9e727fdd3aec8274f46685441900280d' /* Project */ 
+ },
 
  dialog : false,
  callback:  false,
@@ -58,36 +65,37 @@ Pman.Dialog.MTrackTime = {
  {
    var _this = this;
    this.dialog = Roo.factory({
+    xtype : 'LayoutDialog',
     height : 700,
     title : _this._strings['645fcdd1616f8c7dbb207f6802786431'] /* Time Manager */,
     width : 1000,
     xns : Roo,
     '|xns' : 'Roo',
-    xtype : 'LayoutDialog',
     center : {
+     xtype : 'LayoutRegion',
      tabPosition : 'top',
      xns : Roo,
-     '|xns' : 'Roo',
-     xtype : 'LayoutRegion'
+     '|xns' : 'Roo'
     },
     items  : [
      {
+      xtype : 'NestedLayoutPanel',
       region : 'center',
       title : _this._strings['9deec6a3dfda06500b808d70875f0a8f'] /* Log Time */,
       xns : Roo,
       '|xns' : 'Roo',
-      xtype : 'NestedLayoutPanel',
       layout : {
+       xtype : 'BorderLayout',
        xns : Roo,
        '|xns' : 'Roo',
-       xtype : 'BorderLayout',
        center : {
+        xtype : 'LayoutRegion',
         title : _this._strings['9e51cf61fbb08a10c12619611dc818ad'] /* Active / Logged Time */,
         xns : Roo,
-        '|xns' : 'Roo',
-        xtype : 'LayoutRegion'
+        '|xns' : 'Roo'
        },
        east : {
+        xtype : 'LayoutRegion',
         collapsed : true,
         collapsedTitle : 'Ticket Details',
         collapsible : true,
@@ -95,27 +103,24 @@ Pman.Dialog.MTrackTime = {
         title : _this._strings['ed7b9312345d291c1ccf68096e65ca54'] /* Ticket Details */,
         width : 350,
         xns : Roo,
-        '|xns' : 'Roo',
-        xtype : 'LayoutRegion'
+        '|xns' : 'Roo'
        },
        west : {
+        xtype : 'LayoutRegion',
         split : true,
         width : 600,
         xns : Roo,
-        '|xns' : 'Roo',
-        xtype : 'LayoutRegion'
+        '|xns' : 'Roo'
        },
        items  : [
         {
+         xtype : 'GridPanel',
          background : true,
          fitContainer : true,
          fitToframe : true,
          region : 'west',
          tableName : 'cash_invoice_entry',
          title : _this._strings['329a87b3fae81c1c17a185c78d2e0e63'] /* cash_invoice_entry */,
-         xns : Roo,
-         '|xns' : 'Roo',
-         xtype : 'GridPanel',
          listeners : {
           activate : function() {
                _this.timepanel = this;
@@ -124,12 +129,12 @@ Pman.Dialog.MTrackTime = {
                }
            }
          },
+         xns : Roo,
+         '|xns' : 'Roo',
          grid : {
+          xtype : 'Grid',
           autoExpandColumn : 'activity_ref',
           loadMask : true,
-          xns : Roo.grid,
-          '|xns' : 'Roo.grid',
-          xtype : 'Grid',
           listeners : {
            render : function() 
             {
@@ -141,18 +146,21 @@ Pman.Dialog.MTrackTime = {
             },
            rowdblclick : function (_self, rowIndex, e)
             {
-                if (!_this.dialog) return;
+                if (!_this.dialog) { return; }
                 _this.dialog.show( this.getDataSource().getAt(rowIndex), function() {
                     _this.grid.footer.onClick('first');
                 }); 
             }
           },
+          xns : Roo.grid,
+          '|xns' : 'Roo.grid',
           toolbar : {
+           xtype : 'Toolbar',
            xns : Roo,
            '|xns' : 'Roo',
-           xtype : 'Toolbar',
            items  : [
             {
+             xtype : 'ComboBox',
              allowBlank : false,
              displayField : 'name',
              editable : false,
@@ -173,21 +181,18 @@ Pman.Dialog.MTrackTime = {
              typeAhead : true,
              valueField : 'id',
              width : 300,
-             xns : Roo.form,
-             '|xns' : 'Roo.form',
-             xtype : 'ComboBox',
              listeners : {
               render : function (_self)
                {
                        _this.personSelect = _self;
                }
              },
+             xns : Roo.form,
+             '|xns' : 'Roo.form',
              store : {
+              xtype : 'Store',
               remoteSort : true,
               sortInfo : { direction : 'ASC', field: 'id' },
-              xns : Roo.data,
-              '|xns' : 'Roo.data',
-              xtype : 'Store',
               listeners : {
                beforeload : function (_self, o){
                     o.params = o.params || {};
@@ -195,38 +200,38 @@ Pman.Dialog.MTrackTime = {
                     o.params.company_id_comptype = 'OWNER';
                 }
               },
+              xns : Roo.data,
+              '|xns' : 'Roo.data',
               proxy : {
+               xtype : 'HttpProxy',
                method : 'GET',
                url : baseURL + '/Roo/Person.php',
                xns : Roo.data,
-               '|xns' : 'Roo.data',
-               xtype : 'HttpProxy'
+               '|xns' : 'Roo.data'
               },
               reader : {
+               xtype : 'JsonReader',
                fields : [{"name":"id","type":"int"},{"name":"name","type":"string"}],
                id : 'id',
                root : 'data',
                totalProperty : 'total',
                xns : Roo.data,
-               '|xns' : 'Roo.data',
-               xtype : 'JsonReader'
+               '|xns' : 'Roo.data'
               }
              }
             }
            ]
           },
           dataSource : {
+           xtype : 'Store',
            remoteSort : true,
            sortInfo : { field : 'action_dt', direction: 'DESC' },
            xns : Roo.data,
            '|xns' : 'Roo.data',
-           xtype : 'Store',
            proxy : {
+            xtype : 'HttpProxy',
             method : 'GET',
             url : baseURL + '/Roo/cash_invoice_entry.php',
-            xns : Roo.data,
-            '|xns' : 'Roo.data',
-            xtype : 'HttpProxy',
             listeners : {
              beforeload : function (This, params)
               {
@@ -238,9 +243,12 @@ Pman.Dialog.MTrackTime = {
                   
                   
               }
-            }
+            },
+            xns : Roo.data,
+            '|xns' : 'Roo.data'
            },
            reader : {
+            xtype : 'JsonReader',
             fields : [
                 {
                     'name': 'id',
@@ -446,12 +454,12 @@ Pman.Dialog.MTrackTime = {
             root : 'data',
             totalProperty : 'total',
             xns : Roo.data,
-            '|xns' : 'Roo.data',
-            xtype : 'JsonReader'
+            '|xns' : 'Roo.data'
            }
           },
           colModel : [
            {
+            xtype : 'ColumnModel',
             dataIndex : 'action_dt',
             header : _this._strings['a76d4ef5f3f6a672bbfab2865563e530'] /* Time */,
             renderer : function(v,x,r) { 
@@ -462,62 +470,59 @@ Pman.Dialog.MTrackTime = {
             },
             width : 100,
             xns : Roo.grid,
-            '|xns' : 'Roo.grid',
-            xtype : 'ColumnModel'
+            '|xns' : 'Roo.grid'
            },
            {
+            xtype : 'ColumnModel',
             dataIndex : 'ticket_id_summary',
             header : _this._strings['c751439d0db3883ac1c8e816327adcab'] /* Ticket */,
             renderer : function(v) { return String.format('{0}', v ? v.format('d/M/Y') : ''); },
             width : 200,
             xns : Roo.grid,
-            '|xns' : 'Roo.grid',
-            xtype : 'ColumnModel'
+            '|xns' : 'Roo.grid'
            },
            {
+            xtype : 'ColumnModel',
             dataIndex : 'notes',
             header : _this._strings['f4c6f851b00d5518bf888815de279aba'] /* Notes */,
             renderer : function(v) { return String.format('{0}', v ? v.format('d/M/Y') : ''); },
             width : 300,
             xns : Roo.grid,
-            '|xns' : 'Roo.grid',
-            xtype : 'ColumnModel'
+            '|xns' : 'Roo.grid'
            }
           ]
          }
         },
         {
+         xtype : 'NestedLayoutPanel',
          region : 'center',
          xns : Roo,
          '|xns' : 'Roo',
-         xtype : 'NestedLayoutPanel',
          layout : {
+          xtype : 'BorderLayout',
           xns : Roo,
           '|xns' : 'Roo',
-          xtype : 'BorderLayout',
           center : {
+           xtype : 'LayoutRegion',
            title : _this._strings['6cca3734b44a6ae61b40c9a915d122f4'] /* Task Queue */,
            xns : Roo,
-           '|xns' : 'Roo',
-           xtype : 'LayoutRegion'
+           '|xns' : 'Roo'
           },
           north : {
+           xtype : 'LayoutRegion',
            height : 200,
            xns : Roo,
-           '|xns' : 'Roo',
-           xtype : 'LayoutRegion'
+           '|xns' : 'Roo'
           },
           items  : [
            {
+            xtype : 'GridPanel',
             background : true,
             fitContainer : true,
             fitToframe : true,
             region : 'center',
             tableName : 'mtrack_ticket',
             title : _this._strings['3efbc55730fd4af147b96183d8afbd3b'] /* mtrack_ticket */,
-            xns : Roo,
-            '|xns' : 'Roo',
-            xtype : 'GridPanel',
             listeners : {
              activate : function() {
                   _this.queuepanel = this;
@@ -526,12 +531,12 @@ Pman.Dialog.MTrackTime = {
                   }
               }
             },
+            xns : Roo,
+            '|xns' : 'Roo',
             grid : {
+             xtype : 'Grid',
              autoExpandColumn : 'summary',
              loadMask : true,
-             xns : Roo.grid,
-             '|xns' : 'Roo.grid',
-             xtype : 'Grid',
              listeners : {
               render : function() 
                {
@@ -549,12 +554,15 @@ Pman.Dialog.MTrackTime = {
                    }); 
                }
              },
+             xns : Roo.grid,
+             '|xns' : 'Roo.grid',
              toolbar : {
+              xtype : 'Toolbar',
               xns : Roo,
               '|xns' : 'Roo',
-              xtype : 'Toolbar',
               items  : [
                {
+                xtype : 'ComboBox',
                 allowBlank : false,
                 displayField : 'name',
                 editable : false,
@@ -575,9 +583,6 @@ Pman.Dialog.MTrackTime = {
                 typeAhead : true,
                 valueField : 'id',
                 width : 200,
-                xns : Roo.form,
-                '|xns' : 'Roo.form',
-                xtype : 'ComboBox',
                 listeners : {
                  beforeselect : function (combo, record, index)
                   {
@@ -593,12 +598,12 @@ Pman.Dialog.MTrackTime = {
                       _this.projectSel = _self;
                   }
                 },
+                xns : Roo.form,
+                '|xns' : 'Roo.form',
                 store : {
+                 xtype : 'Store',
                  remoteSort : true,
                  sortInfo : { field: 'code', direction: 'ASC' },
-                 xns : Roo.data,
-                 '|xns' : 'Roo.data',
-                 xtype : 'Store',
                  listeners : {
                   beforeload : function (_self, o){
                        o.params = o.params || {};
@@ -607,40 +612,43 @@ Pman.Dialog.MTrackTime = {
                        // set more here
                    }
                  },
+                 xns : Roo.data,
+                 '|xns' : 'Roo.data',
                  proxy : {
+                  xtype : 'HttpProxy',
                   method : 'GET',
-                  url : baseURL + '/Roo/core_project',
+                  url : baseURL + '/Roo/Projects.php',
                   xns : Roo.data,
-                  '|xns' : 'Roo.data',
-                  xtype : 'HttpProxy'
+                  '|xns' : 'Roo.data'
                  },
                  reader : {
+                  xtype : 'JsonReader',
                   fields : [{"name":"id","type":"int"},{"name":"name","type":"string"}],
                   id : 'id',
                   root : 'data',
                   totalProperty : 'total',
                   xns : Roo.data,
-                  '|xns' : 'Roo.data',
-                  xtype : 'JsonReader'
+                  '|xns' : 'Roo.data'
                  }
                 }
                }
               ]
              },
              dataSource : {
+              xtype : 'Store',
               remoteSort : true,
               sortInfo : { field : 'summary', direction: 'ASC' },
               xns : Roo.data,
               '|xns' : 'Roo.data',
-              xtype : 'Store',
               proxy : {
+               xtype : 'HttpProxy',
                method : 'GET',
                url : baseURL + '/Roo/mtrack_ticket.php',
                xns : Roo.data,
-               '|xns' : 'Roo.data',
-               xtype : 'HttpProxy'
+               '|xns' : 'Roo.data'
               },
               reader : {
+               xtype : 'JsonReader',
                fields : [
                    {
                        'name': 'id',
@@ -1119,55 +1127,55 @@ Pman.Dialog.MTrackTime = {
                root : 'data',
                totalProperty : 'total',
                xns : Roo.data,
-               '|xns' : 'Roo.data',
-               xtype : 'JsonReader'
+               '|xns' : 'Roo.data'
               }
              },
              colModel : [
               {
+               xtype : 'ColumnModel',
                dataIndex : 'summary',
                header : _this._strings['290612199861c31d1036b185b4e69b75'] /* Summary */,
                renderer : function(v) { return String.format('{0}', v); },
                width : 200,
                xns : Roo.grid,
-               '|xns' : 'Roo.grid',
-               xtype : 'ColumnModel'
+               '|xns' : 'Roo.grid'
               }
              ]
             }
            },
            {
+            xtype : 'ContentPanel',
             region : 'north',
             xns : Roo,
             '|xns' : 'Roo',
-            xtype : 'ContentPanel',
             toolbar : {
+             xtype : 'Toolbar',
              xns : Roo,
              '|xns' : 'Roo',
-             xtype : 'Toolbar',
              items  : [
               {
+               xtype : 'Button',
                text : _this._strings['b2439dea1dd89e6f694df484214e57cf'] /* Working on this */,
                xns : Roo.Toolbar,
-               '|xns' : 'Roo.Toolbar',
-               xtype : 'Button'
+               '|xns' : 'Roo.Toolbar'
               },
               {
+               xtype : 'Button',
                text : _this._strings['07ca5050e697392c9ed47e6453f1453f'] /* Completed */,
                xns : Roo.Toolbar,
-               '|xns' : 'Roo.Toolbar',
-               xtype : 'Button'
+               '|xns' : 'Roo.Toolbar'
               },
               {
+               xtype : 'Button',
                text : _this._strings['1fa1f1ccb57b2486b4c05122d64868d4'] /* Not on Project work */,
                xns : Roo.Toolbar,
-               '|xns' : 'Roo.Toolbar',
-               xtype : 'Button'
+               '|xns' : 'Roo.Toolbar'
               }
              ]
             },
             items  : [
              {
+              xtype : 'Form',
               activeData : false,
               method : 'POST',
               saveActive : function(rec, effort) {
@@ -1237,9 +1245,6 @@ Pman.Dialog.MTrackTime = {
               },
               style : 'margin-left:10px;',
               url : baseURL + '/Roo/cash_invoice_entry.php',
-              xns : Roo.form,
-              '|xns' : 'Roo.form',
-              xtype : 'Form',
               listeners : {
                actioncomplete : function(_self,action)
                 {
@@ -1321,8 +1326,11 @@ Pman.Dialog.MTrackTime = {
                     _this.form= form;
                 }
               },
+              xns : Roo.form,
+              '|xns' : 'Roo.form',
               items  : [
                {
+                xtype : 'ComboBox',
                 allowBlank : false,
                 displayField : 'name',
                 editable : false,
@@ -1343,9 +1351,6 @@ Pman.Dialog.MTrackTime = {
                 typeAhead : true,
                 valueField : 'id',
                 width : 200,
-                xns : Roo.form,
-                '|xns' : 'Roo.form',
-                xtype : 'ComboBox',
                 listeners : {
                  beforeselect : function (combo, record, index)
                   {
@@ -1374,12 +1379,12 @@ Pman.Dialog.MTrackTime = {
                       _this.projectSel = _self;
                   }
                 },
+                xns : Roo.form,
+                '|xns' : 'Roo.form',
                 store : {
+                 xtype : 'Store',
                  remoteSort : true,
                  sortInfo : { field: 'code', direction: 'ASC' },
-                 xns : Roo.data,
-                 '|xns' : 'Roo.data',
-                 xtype : 'Store',
                  listeners : {
                   beforeload : function (_self, o){
                        o.params = o.params || {};
@@ -1388,39 +1393,39 @@ Pman.Dialog.MTrackTime = {
                        // set more here
                    }
                  },
+                 xns : Roo.data,
+                 '|xns' : 'Roo.data',
                  proxy : {
+                  xtype : 'HttpProxy',
                   method : 'GET',
-                  url : baseURL + '/Roo/core_project',
+                  url : baseURL + '/Roo/Projects.php',
                   xns : Roo.data,
-                  '|xns' : 'Roo.data',
-                  xtype : 'HttpProxy'
+                  '|xns' : 'Roo.data'
                  },
                  reader : {
+                  xtype : 'JsonReader',
                   fields : [{"name":"id","type":"int"},{"name":"name","type":"string"}],
                   id : 'id',
                   root : 'data',
                   totalProperty : 'total',
                   xns : Roo.data,
-                  '|xns' : 'Roo.data',
-                  xtype : 'JsonReader'
+                  '|xns' : 'Roo.data'
                  }
                 }
                },
                {
+                xtype : 'Column',
                 labelAlign : 'top',
                 width : 300,
                 xns : Roo.form,
                 '|xns' : 'Roo.form',
-                xtype : 'Column',
                 items  : [
                  {
+                  xtype : 'TextArea',
                   fieldLabel : _this._strings['b5a7adde1af5c87d7fd797b6245c2a39'] /* Description */,
                   height : 120,
                   name : 'description',
                   width : 300,
-                  xns : Roo.form,
-                  '|xns' : 'Roo.form',
-                  xtype : 'TextArea',
                   listeners : {
                    keyup : function (_self, e)
                     {
@@ -1428,51 +1433,53 @@ Pman.Dialog.MTrackTime = {
                         _this.grid.dataSource.updateBar(_this.selectedRec);
                      
                     }
-                  }
+                  },
+                  xns : Roo.form,
+                  '|xns' : 'Roo.form'
                  }
                 ]
                },
                {
+                xtype : 'Hidden',
                 name : 'action',
                 xns : Roo.form,
-                '|xns' : 'Roo.form',
-                xtype : 'Hidden'
+                '|xns' : 'Roo.form'
                },
                {
+                xtype : 'Hidden',
                 name : 'staff_id',
                 xns : Roo.form,
-                '|xns' : 'Roo.form',
-                xtype : 'Hidden'
+                '|xns' : 'Roo.form'
                },
                {
+                xtype : 'Hidden',
                 name : 'qtyvalue',
                 xns : Roo.form,
-                '|xns' : 'Roo.form',
-                xtype : 'Hidden'
+                '|xns' : 'Roo.form'
                },
                {
+                xtype : 'Hidden',
                 name : 'qtyvalue2',
                 xns : Roo.form,
-                '|xns' : 'Roo.form',
-                xtype : 'Hidden'
+                '|xns' : 'Roo.form'
                },
                {
+                xtype : 'Hidden',
                 name : 'entry_dt',
                 xns : Roo.form,
-                '|xns' : 'Roo.form',
-                xtype : 'Hidden'
+                '|xns' : 'Roo.form'
                },
                {
+                xtype : 'Hidden',
                 name : 'action_dt',
                 xns : Roo.form,
-                '|xns' : 'Roo.form',
-                xtype : 'Hidden'
+                '|xns' : 'Roo.form'
                },
                {
+                xtype : 'Hidden',
                 name : 'id',
                 xns : Roo.form,
-                '|xns' : 'Roo.form',
-                xtype : 'Hidden'
+                '|xns' : 'Roo.form'
                }
               ]
              }
@@ -1485,39 +1492,37 @@ Pman.Dialog.MTrackTime = {
       }
      },
      {
+      xtype : 'NestedLayoutPanel',
       region : 'center',
       title : _this._strings['642f8356fcf65868f037f92e0e10c3cd'] /* Plan Time */,
       xns : Roo,
       '|xns' : 'Roo',
-      xtype : 'NestedLayoutPanel',
       layout : {
+       xtype : 'BorderLayout',
        xns : Roo,
        '|xns' : 'Roo',
-       xtype : 'BorderLayout',
        center : {
+        xtype : 'LayoutRegion',
         title : _this._strings['f49f927095bb01b44c96d29c8c09f3a3'] /* Assigned to  / Prioritized (all projects) */,
         xns : Roo,
-        '|xns' : 'Roo',
-        xtype : 'LayoutRegion'
+        '|xns' : 'Roo'
        },
        west : {
+        xtype : 'LayoutRegion',
         title : _this._strings['9a221c25cceeb0d108ff6cb635dc8b8b'] /* Open Tasks (Unassigned) / Select Project */,
         width : 450,
         xns : Roo,
-        '|xns' : 'Roo',
-        xtype : 'LayoutRegion'
+        '|xns' : 'Roo'
        },
        items  : [
         {
+         xtype : 'GridPanel',
          background : false,
          fitContainer : true,
          fitToframe : true,
          region : 'west',
          tableName : 'mtrack_ticket',
          title : _this._strings['3efbc55730fd4af147b96183d8afbd3b'] /* mtrack_ticket */,
-         xns : Roo,
-         '|xns' : 'Roo',
-         xtype : 'GridPanel',
          listeners : {
           activate : function() {
                _this.openpanel = this;
@@ -1526,12 +1531,12 @@ Pman.Dialog.MTrackTime = {
                }
            }
          },
+         xns : Roo,
+         '|xns' : 'Roo',
          grid : {
+          xtype : 'Grid',
           autoExpandColumn : 'summary',
           loadMask : true,
-          xns : Roo.grid,
-          '|xns' : 'Roo.grid',
-          xtype : 'Grid',
           listeners : {
            render : function() 
             {
@@ -1549,12 +1554,15 @@ Pman.Dialog.MTrackTime = {
                 }); 
             }
           },
+          xns : Roo.grid,
+          '|xns' : 'Roo.grid',
           toolbar : {
+           xtype : 'Toolbar',
            xns : Roo,
            '|xns' : 'Roo',
-           xtype : 'Toolbar',
            items  : [
             {
+             xtype : 'ComboBox',
              displayField : '',
              editable : false,
              emptyText : _this._strings['6a58f977f2b623b695a340766f2a6843'] /* Select Project */,
@@ -1576,53 +1584,53 @@ Pman.Dialog.MTrackTime = {
              width : 300,
              xns : Roo.form,
              '|xns' : 'Roo.form',
-             xtype : 'ComboBox',
              store : {
+              xtype : 'Store',
               remoteSort : true,
               sortInfo : { direction : 'ASC', field: 'id' },
-              xns : Roo.data,
-              '|xns' : 'Roo.data',
-              xtype : 'Store',
               listeners : {
                beforeload : function (_self, o){
                     o.params = o.params || {};
                     // set more here
                 }
               },
+              xns : Roo.data,
+              '|xns' : 'Roo.data',
               proxy : {
+               xtype : 'HttpProxy',
                method : 'GET',
                url : baseURL + '/Roo/mtrack_ticket.php',
                xns : Roo.data,
-               '|xns' : 'Roo.data',
-               xtype : 'HttpProxy'
+               '|xns' : 'Roo.data'
               },
               reader : {
+               xtype : 'JsonReader',
                fields : [{"name":"id","type":"int"},{"name":"summary","type":"string"}],
                id : 'id',
                root : 'data',
                totalProperty : 'total',
                xns : Roo.data,
-               '|xns' : 'Roo.data',
-               xtype : 'JsonReader'
+               '|xns' : 'Roo.data'
               }
              }
             }
            ]
           },
           dataSource : {
+           xtype : 'Store',
            remoteSort : true,
            sortInfo : { field : 'summary', direction: 'ASC' },
            xns : Roo.data,
            '|xns' : 'Roo.data',
-           xtype : 'Store',
            proxy : {
+            xtype : 'HttpProxy',
             method : 'GET',
             url : baseURL + '/Roo/mtrack_ticket.php',
             xns : Roo.data,
-            '|xns' : 'Roo.data',
-            xtype : 'HttpProxy'
+            '|xns' : 'Roo.data'
            },
            reader : {
+            xtype : 'JsonReader',
             fields : [
                 {
                     'name': 'id',
@@ -2101,33 +2109,30 @@ Pman.Dialog.MTrackTime = {
             root : 'data',
             totalProperty : 'total',
             xns : Roo.data,
-            '|xns' : 'Roo.data',
-            xtype : 'JsonReader'
+            '|xns' : 'Roo.data'
            }
           },
           colModel : [
            {
+            xtype : 'ColumnModel',
             dataIndex : 'summary',
             header : _this._strings['290612199861c31d1036b185b4e69b75'] /* Summary */,
             renderer : function(v) { return String.format('{0}', v); },
             width : 200,
             xns : Roo.grid,
-            '|xns' : 'Roo.grid',
-            xtype : 'ColumnModel'
+            '|xns' : 'Roo.grid'
            }
           ]
          }
         },
         {
+         xtype : 'GridPanel',
          background : false,
          fitContainer : true,
          fitToframe : true,
          region : 'center',
          tableName : 'mtrack_ticket',
          title : _this._strings['3efbc55730fd4af147b96183d8afbd3b'] /* mtrack_ticket */,
-         xns : Roo,
-         '|xns' : 'Roo',
-         xtype : 'GridPanel',
          listeners : {
           activate : function() {
                _this.openpanel = this;
@@ -2136,12 +2141,12 @@ Pman.Dialog.MTrackTime = {
                }
            }
          },
+         xns : Roo,
+         '|xns' : 'Roo',
          grid : {
+          xtype : 'Grid',
           autoExpandColumn : 'summary',
           loadMask : true,
-          xns : Roo.grid,
-          '|xns' : 'Roo.grid',
-          xtype : 'Grid',
           listeners : {
            render : function() 
             {
@@ -2159,12 +2164,15 @@ Pman.Dialog.MTrackTime = {
                 }); 
             }
           },
+          xns : Roo.grid,
+          '|xns' : 'Roo.grid',
           toolbar : {
+           xtype : 'Toolbar',
            xns : Roo,
            '|xns' : 'Roo',
-           xtype : 'Toolbar',
            items  : [
             {
+             xtype : 'ComboBox',
              displayField : '',
              editable : false,
              emptyText : _this._strings['340c2ee497b85d5954b01c64de7f44f6'] /* Select Person */,
@@ -2186,53 +2194,53 @@ Pman.Dialog.MTrackTime = {
              width : 300,
              xns : Roo.form,
              '|xns' : 'Roo.form',
-             xtype : 'ComboBox',
              store : {
+              xtype : 'Store',
               remoteSort : true,
               sortInfo : { direction : 'ASC', field: 'id' },
-              xns : Roo.data,
-              '|xns' : 'Roo.data',
-              xtype : 'Store',
               listeners : {
                beforeload : function (_self, o){
                     o.params = o.params || {};
                     // set more here
                 }
               },
+              xns : Roo.data,
+              '|xns' : 'Roo.data',
               proxy : {
+               xtype : 'HttpProxy',
                method : 'GET',
                url : baseURL + '/Roo/mtrack_ticket.php',
                xns : Roo.data,
-               '|xns' : 'Roo.data',
-               xtype : 'HttpProxy'
+               '|xns' : 'Roo.data'
               },
               reader : {
+               xtype : 'JsonReader',
                fields : [{"name":"id","type":"int"},{"name":"summary","type":"string"}],
                id : 'id',
                root : 'data',
                totalProperty : 'total',
                xns : Roo.data,
-               '|xns' : 'Roo.data',
-               xtype : 'JsonReader'
+               '|xns' : 'Roo.data'
               }
              }
             }
            ]
           },
           dataSource : {
+           xtype : 'Store',
            remoteSort : true,
            sortInfo : { field : 'summary', direction: 'ASC' },
            xns : Roo.data,
            '|xns' : 'Roo.data',
-           xtype : 'Store',
            proxy : {
+            xtype : 'HttpProxy',
             method : 'GET',
             url : baseURL + '/Roo/mtrack_ticket.php',
             xns : Roo.data,
-            '|xns' : 'Roo.data',
-            xtype : 'HttpProxy'
+            '|xns' : 'Roo.data'
            },
            reader : {
+            xtype : 'JsonReader',
             fields : [
                 {
                     'name': 'id',
@@ -2711,19 +2719,18 @@ Pman.Dialog.MTrackTime = {
             root : 'data',
             totalProperty : 'total',
             xns : Roo.data,
-            '|xns' : 'Roo.data',
-            xtype : 'JsonReader'
+            '|xns' : 'Roo.data'
            }
           },
           colModel : [
            {
+            xtype : 'ColumnModel',
             dataIndex : 'summary',
             header : _this._strings['290612199861c31d1036b185b4e69b75'] /* Summary */,
             renderer : function(v) { return String.format('{0}', v); },
             width : 200,
             xns : Roo.grid,
-            '|xns' : 'Roo.grid',
-            xtype : 'ColumnModel'
+            '|xns' : 'Roo.grid'
            }
           ]
          }