Merge branch '1082958_observationTranslation' into '2021.1'

1082958 observation translation

See merge request xrm/basic!1147

entity/KeywordEntry_entity/KeywordEntry_entity.aod

@@ -291,6 +291,9 @@
         <jDitoRecordFieldMapping>
           <name>UID.value</name>
         </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CONTAINER.value</name>
+        </jDitoRecordFieldMapping>
       </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>

entity/KeywordEntry_entity/recordcontainers/jdito/contentProcess.js

@@ -17,7 +17,7 @@ var CATEGORY_RESULT_INDEX_SORTINGBY = 2;
 var CATEGORY_RESULT_INDEX_SORTINGDIR = 3;
 
 var resultSet = [];
-var keywordStatement = newSelect("AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ENTRY.TITLE, AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID as UID")
+var keywordStatement = newSelect("AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ENTRY.TITLE, AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID as UID, AB_KEYWORD_CATEGORY.NAME")
                 .from("AB_KEYWORD_ENTRY")
                 .join("AB_KEYWORD_CATEGORY", "AB_KEYWORD_ENTRY.AB_KEYWORD_CATEGORY_ID = AB_KEYWORD_CATEGORY.AB_KEYWORD_CATEGORYID")
                 .where();

process/Workflow_lib/process.js

@@ -416,35 +416,76 @@ WorkflowVariables.CHANGED_ROWS_TYPES.getDefaultValue = function ()
     let types = {};
     if (vars.exists("$local.changed"))
     {
-        let isDBrc = project.getRecordContainerModel(ContextUtils.getEntity(ContextUtils.getCurrentContextId())).type ==  project.RECORDCONTAINERTYPE_DB;
+        var entityName = ContextUtils.getEntity(ContextUtils.getCurrentContextId());
+        var isDBrc = project.getRecordContainerModel(entityName).type == project.RECORDCONTAINERTYPE_DB;
+        var entityFields = project.getEntityStructure(entityName).fields;
     
-        vars.get("$local.changed").forEach(function(pField) { 
-            let splitedField = pField.split(".");
+        vars.get("$local.changed").forEach(function(pField) 
+        { 
+            let splittedField = pField.split(".");
             let fieldName;
             if  (isDBrc) 
             {
-                fieldName = splitedField[1]
+                fieldName = splittedField[1];
             } 
             else 
             {
-                fieldName = splitedField[0]
+                fieldName = splittedField[0];
             }
-        
-            if (splitedField[1] != "displayValue" && vars.exists("$property." + fieldName + ".contentType") )
+            
+            if (splittedField[1] != "displayValue" && vars.exists("$property." + fieldName + ".contentType"))
             {
-                let contentType = vars.get("$property." + fieldName + ".contentType").trim();
-                types[pField] = contentType;
+                types[pField] = vars.get("$property." + fieldName + ".contentType").trim();
             }
-        
-            if (splitedField[1] != "displayValue" && vars.exists("$field." + fieldName + ".displayValue") && vars.get("$field." + fieldName + ".displayValue") )
+            
+            if (types[pField] == "DATE")
+            {
+                types[pField] = {
+                    type: "DATE",
+                    dateFormat: _getDateFormat(entityFields, fieldName)
+                };
+            }
+            
+            var keywordContainer = splittedField[1] != "displayValue" ? _getKeywordContainer(entityFields, fieldName) : null;
+            if (keywordContainer)
             {
-                types[pField] = "DROP_DOWN" + "::" + vars.get("$field." + fieldName + ".displayValue").trim();
+                types[pField] = {
+                    type: "KEYWORD",
+                    keywordContainer: keywordContainer
+                };
+            }
+            else if (splittedField[1] != "displayValue" && vars.exists("$field." + fieldName + ".displayValue") && vars.get("$field." + fieldName + ".displayValue") )
+            {
+                types[pField] = {
+                    type: "DROP_DOWN",
+                    displayValue: vars.get("$field." + fieldName + ".displayValue").trim()
+                };
             }
                 
         });
     }
     
     return JSON.stringify(types);
+    
+    function _getKeywordContainer (pEntityFields, pFieldName)
+    {
+        var consumer = pFieldName in pEntityFields ? pEntityFields[pFieldName].consumer : null;
+        if (consumer && consumer in pEntityFields && pEntityFields[consumer].entityName == "KeywordEntry_entity")
+        {
+            var keywordConfig = entities.createConfigForLoadingConsumerRows().fields(["CONTAINER"]).consumer(consumer);
+            var keywordData = entities.getRows(keywordConfig);
+            if (keywordData.length > 0)
+            {
+                return keywordData[0]["CONTAINER"];
+            }
+        }
+        return null;
+    }
+    
+    function _getDateFormat (pEntityFields, pFieldName)
+    {
+        return pFieldName in pEntityFields ? pEntityFields[pFieldName].outputFormat : null;
+    }
 }
 
 /**