[Projekt: Entwicklung - Neon][TicketNr.: 1032312][Keywords für bestehende Module anlegen]

entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js

@@ -5,4 +5,4 @@ import("Keyword_lib");
 var cType = vars.get("$field.CONTRACTTYPE");
 var cCode = vars.get("$field.CONTRACTCODE");
 
-result.string(KeywordUtils.getViewValue("CONTRACT.CONTRACTTYPE", cType) + " : " + cCode);
\ No newline at end of file
+result.string(KeywordUtils.getViewValue($KeywordRegistry.get.ContractType, cType) + " : " + cCode);
\ No newline at end of file

entity/Contract_entity/entityfields/image/valueProcess.js

@@ -2,4 +2,4 @@ import("system.vars");
 import("system.result");
 import("Keyword_lib");
 
-result.string("TEXT:" + KeywordUtils.getViewValue("CONTRACT.CONTRACTTYPE", vars.getString("$field.CONTRACTTYPE")) );
\ No newline at end of file
+result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.get.ContractType, vars.getString("$field.CONTRACTTYPE")) );
\ No newline at end of file

entity/Order_entity/entityfields/image/valueProcess.js

@@ -2,4 +2,4 @@ import("system.vars");
 import("system.result");
 import("Keyword_lib");
 
-result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.get.SalesprojectState, vars.getString("$field.STATUS")) );
\ No newline at end of file
+result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.get.SalesorderState, vars.getString("$field.STATUS")) );
\ No newline at end of file

entity/Prod2prod_entity/entityfields/source_id/possibleItemsProcess.js

@@ -23,7 +23,7 @@ var prods = db.table("select PRODUCTID, GROUPCODEID, PRODUCTNAME, PRODUCTCODE fr
 var res = [];
 for(var i = 0; i < prods.length; i++)
 {
-    res.push([prods[i][0], KeywordUtils.getViewValue("GROUPCODE", prods[i][1]) + " / " + prods[i][2] + " / " + prods[i][3]]);
+    res.push([prods[i][0], KeywordUtils.getViewValue($KeywordRegistry.get.ProductGroupcode, prods[i][1]) + " / " + prods[i][2] + " / " + prods[i][3]]);
 }
 
 result.object(res);
\ No newline at end of file

process/Keyword_lib/process.js

@@ -142,8 +142,30 @@ KeywordUtils.getResolvedTitleSqlPart = function(pContainerName, pDbFieldName, pL
      * }
      */
     KeywordUtils.getViewValue = function(keywordType, key){
-        var k = KeywordUtils.createKeyword(keywordType);
-        return k.getPropForKey(key, "name") || "";
+        //temporary solution: support old (=legacy) and new keyword logic
+        if ($KeywordRegistry.get[keywordType])
+        {
+            //new keyword logic
+            /*select AB_KEYWORD_ENTRY.TITLE
+            from AB_KEYWORD_ENTRY
+            where AB_KEYWORD_ENTRY.CONTAINER = '' and KEYID = ''*/
+            var sql = SqlCondition.begin()
+                                   .andPrepare("AB_KEYWORD_ENTRY.CONTAINER", keywordType)
+                                   .andPrepare("AB_KEYWORD_ENTRY.KEYID", key)
+                                   .buildSql("select AB_KEYWORD_ENTRY.TITLE from AB_KEYWORD_ENTRY");
+            var originalTitle = db.cell(sql);
+            if (originalTitle == "")
+                return "";
+            
+            var translatedTitle = translate.text(originalTitle);
+            return translatedTitle;
+        }
+        else
+        {
+            //legacy keyword logic
+            var k = KeywordUtils.createKeyword(keywordType);
+            return k.getPropForKey(key, "name") || "";
+        }
     }
 
     /**

process/Org_lib/process.js

@@ -151,7 +151,7 @@ OrgUtils.openOrgReport = function(pOrgId)
     
     taskData.forEach(function (row) 
     {
-        row[2] = KeywordUtils.getViewValue("TASK.STATUS", row[2]);
+        row[2] = KeywordUtils.getViewValue($KeywordRegistry.get.TaskStatus, row[2]);
         _joinArrayVals(row, 3, 2); //join FIRSTNAME and LASTNAME together
     });
     taskData = ReportData.begin(["SUBJECT", "INFOTEXT", "STATUS", "RESPONSIBLE"]).add(taskData);