X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Dialog.CoreCompanies.bjs;h=70ea94ec9a643dc15adc598c596c54fbf6dfc1db;hp=95641ae289c6c5db29ec6d9841f7a2fc70dce8a1;hb=refs%2Fheads%2Fwip_alan_T6343_generic_progress_bar_delete;hpb=04af3ce33e2be35e423d477e06b32e3bd55ca49d

diff --git a/Pman.Dialog.CoreCompanies.bjs b/Pman.Dialog.CoreCompanies.bjs
index 95641ae2..70ea94ec 100644
--- a/Pman.Dialog.CoreCompanies.bjs
+++ b/Pman.Dialog.CoreCompanies.bjs
@@ -2,7 +2,7 @@
  "name" : "Pman.Dialog.CoreCompanies",
  "parent" : "",
  "title" : "",
- "path" : "/home/edward/gitlive/Pman.Core/Pman.Dialog.CoreCompanies.bjs",
+ "path" : "/home/alan/gitlive/Pman.Core/Pman.Dialog.CoreCompanies.bjs",
  "permname" : "",
  "modOrder" : "001",
  "strings" : {
@@ -33,6 +33,30 @@
   "35cb9e66ff801a819684ee0fbeabaeeb" : "Background Colour",
   "bc87ef2144ae15ef4f78211e73948051" : "Logo Image"
  },
+ "named_strings" : {
+  "name_qtip" : "4ef6052d74436756f08e95fd63949653",
+  "tel_fieldLabel" : "bcc254b55c4a1babdf1dcb82c207506b",
+  "address_qtip" : "32c4e9483403d60115b21519178e5384",
+  "background_color_fieldLabel" : "35cb9e66ff801a819684ee0fbeabaeeb",
+  "comptype_id_display_name_emptyText" : "023a5dfa857c4aa0156e6685231a1dbd",
+  "comptype_id_display_name_fieldLabel" : "a1fa27779242b4902f7ae3bdd5c6d508",
+  "comptype_id_display_name_loadingText" : "1243daf593fa297e07ab03bf06d925af",
+  "code_fieldLabel" : "b33457e7e1cd5dbf1db34a0c60fcb75f",
+  "fax_fieldLabel" : "9810aa2b9f44401be4bf73188ef2b67d",
+  "name_fieldLabel" : "e7b47c58815acf1d3afa59a84b5db7fb",
+  "fax_qtip" : "cf3a5d25d39613ad5bbc2f5eb0f9b675",
+  "url_qtip" : "8c04eb09879a05470fae436ba76e3bb9",
+  "remarks_fieldLabel" : "231bc72756b5e6de492aaaa1577f61b1",
+  "code_qtip" : "733640ec0c9367df1b4d85eb286ed9ae",
+  "tel_qtip" : "bc3a4c40d007b8d610a16312970e5cb3",
+  "email_qtip" : "9f86c00615b1a210935ac28ff8ebbb22",
+  "url_fieldLabel" : "02a3a357710cc2a5dfdfb74ed012fb59",
+  "remarks_qtip" : "c54b90756cfbeff9217293b567cb2eb0",
+  "comptype_id_display_name_qtip" : "8535bcc0f05358a583bb432bbadf7e0d",
+  "email_fieldLabel" : "ce8ae9da5b7cd6c3df2929543a9af92d",
+  "address_fieldLabel" : "dd7bf230fde8d4836917806aff6a6b27",
+  "logo_id_fieldLabel" : "bc87ef2144ae15ef4f78211e73948051"
+ },
  "items" : [
   {
    "modal" : true,
@@ -70,7 +94,7 @@
         "actioncomplete" : "function(f, act) {\n    _this.dialog.el.unmask();\n    //console.log('load completed'); \n    // error messages?????\n    if(act.type == 'setdata'){\n        this.load({ method: 'GET', params: { '_id' : _this.data.id }});\n        return;\n    }\n   \n    if (act.type == 'load') {\n        _this.data = act.result.data;\n        var meth = _this.data.comptype == 'OWNER' ? 'disable' : 'enable';\n     \n            \n        if (_this.form.findField('comptype')) {\n            _this.form.findField('comptype')[meth]();\n        }\n         \n       // _this.loaded();\n        return;\n    }\n    \n    \n    if (act.type == 'submit') { // only submitted here if we are \n        _this.dialog.hide();\n       \n        if (_this.callback) {\n            _this.callback.call(this, act.result.data);\n        }\n        return; \n    }\n    // unmask?? \n}",
         "rendered" : "function (form)\n{\n    _this.form = form;\n}"
        },
-       "$ url" : "baseURL + '/Roo/Companies.php'",
+       "$ url" : "baseURL + '/Roo/core_company.php'",
        "fileUpload" : true,
        "xtype" : "Form",
        "labelWidth" : 160,
@@ -94,9 +118,9 @@
            "listeners" : {
             "render" : "function (_self)\n{\n    _this.etypeCombo = _self;\n}"
            },
-           "alwaysQuery" : true,
            "listWidth" : 250,
            "Boolean allowBlank" : false,
+           "alwaysQuery" : true,
            "triggerAction" : "all",
            "fieldLabel" : "Type",
            "forceSelection" : true,
@@ -104,14 +128,14 @@
            "pageSize" : 20,
            "emptyText" : "Select Type",
            "displayField" : "display_name",
-           "hiddenName" : "comptype",
+           "hiddenName" : "comptype_id",
            "minChars" : 2,
-           "valueField" : "name",
+           "valueField" : "id",
            "xtype" : "ComboBox",
            "typeAhead" : false,
            "width" : 200,
            "$ xns" : "Roo.form",
-           "name" : "comptype_display_name",
+           "name" : "comptype_id_display_name",
            "qtip" : "Select type",
            "queryParam" : "query[name]",
            "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{name}</b> : {display_name}</div>",
@@ -238,7 +262,7 @@
           },
           {
            "listeners" : {
-            "click" : "function (_self, e)\n{\n    var _t = _this.form.findField('logo_id');\n                         \n    Pman.Dialog.Image.show({\n        onid :_this.data.id,\n        ontable : 'Companies',\n        imgtype : 'LOGO'\n    }, function(data) {\n        if  (data) {\n            _t.setValue(data.id);\n        }\n        \n    });\n}"
+            "click" : "function (_self, e)\n{\n    var _t = _this.form.findField('logo_id');\n                         \n    Pman.Dialog.Image.show({\n        onid :_this.data.id,\n        ontable : 'core_company',\n        imgtype : 'LOGO'\n    }, function(data) {\n        if  (data) {\n            _t.setValue(data.id);\n        }\n        \n    });\n}"
            },
            "text" : "Add Image",
            "xtype" : "Button",
@@ -266,7 +290,7 @@
     },
     {
      "listeners" : {
-      "click" : "function (_self, e)\n{\n    if(!_this.form.isValid()){\n        Roo.MessageBox.alert('Error', 'Please Correct all the errors in red');\n        return;\n    }\n    \n    new Pman.Request({\n        url : baseURL + '/Roo/Core_company.php',\n        method : 'POST',\n        params : {\n          id : _this.form.findField('id').getValue() * 1,\n          name : _this.form.findField('name').getValue(),\n          _check_name : 1\n        }, \n        success : function(res) {\n            _this.dialog.el.mask(\"Saving\");\n            _this.form.doAction(\"submit\");\n        },\n        failure : function(res) {\n            Roo.log(res);\n        }\n    });\n    \n    return;\n    \n}"
+      "click" : "function (_self, e)\n{\n    if(!_this.form.isValid()){\n        Roo.MessageBox.alert('Error', 'Please Correct all the errors in red');\n        return;\n    }\n    \n    new Pman.Request({\n        url : baseURL + '/Roo/Core_company.php',\n        method : 'POST',\n        params : {\n          id : _this.form.findField('id').getValue() * 1,\n          name : _this.form.findField('name').getValue(),\n          _check_name : 1\n        }, \n        success : function(res) {\n            _this.dialog.el.mask(\"Saving\");\n            _this.form.doAction(\"submit\");\n        },\n        failure : function(res) {\n            Roo.MessageBox.confirm(\n                \"Confirm\", \n                \"The company name has been used. Save it anyway?\", \n                function(res) {\n                    if(res != 'yes') {\n                        return;\n                    }\n                    \n                    _this.dialog.el.mask(\"Saving\");\n                    _this.form.doAction(\"submit\");\n                }\n            );\n        }\n    });\n    \n    return;\n    \n}"
      },
      "text" : "Save",
      "xtype" : "Button",