merged origin/2021.2.1 into 2021.2

entity/Activity_entity/Activity_entity.aod

@@ -630,11 +630,10 @@
         </entityActionField>
         <entityActionField>
           <name>addAttributeToSelection</name>
-          <title>Set attribute (use filter result)</title>
+          <title>Set attribute</title>
           <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/filteractions/children/addattributetoselection/onActionProcess.js</onActionProcess>
           <isObjectAction v="false" />
           <iconId>VAADIN:TAGS</iconId>
-          <titleProcess>%aditoprj%/entity/Activity_entity/entityfields/filteractions/children/addattributetoselection/titleProcess.js</titleProcess>
         </entityActionField>
       </children>
     </entityActionGroup>

entity/Activity_entity/entityfields/filteractions/children/addattributetoselection/onActionProcess.js

+import("system.neonFilter");
 import("system.translate");
 import("system.neon");
 import("Context_lib");
@@ -23,4 +24,5 @@ var params = {
     "ContextTitlePlural_param": translate.text("Activities")
 }
 
-neon.openContext("AddAttributesToSelection", "AddAttributesToSelectionEdit_view", null, neon.OPERATINGSTATE_NEW, params, null);
\ No newline at end of file
+var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString();
+neon.openContextWithRecipe("AddAttributesToSelection", "AddAttributesToSelectionEdit_view", recipe, neon.OPERATINGSTATE_NEW);

entity/Activity_entity/entityfields/filteractions/children/addattributetoselection/titleProcess.js

-import("system.translate");
-import("system.result");
-import("system.vars");
-
-if (vars.get("$sys.selection").length > 0)
-{
-    result.string(translate.text("set attribute (selected data)"))
-}
\ No newline at end of file

entity/Activity_entity/entityfields/msteamsactions/children/importfromteams/onActionProcess.js

+import("system.neonFilter");
 import("system.vars");
 import("system.neon");
 
-neon.openContext("MSTeamsActivityImport", "MSTeamsActivityImportEdit_view", null, neon.OPERATINGSTATE_VIEW, {
+var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters({
     "ObjectRowId_param" : vars.get("$param.RowId_param"),
     "ObjectType_param": vars.get("$param.ObjectId_param")
-});
\ No newline at end of file
+}).toString();
+neon.openContextWithRecipe("MSTeamsActivityImport", "MSTeamsActivityImportEdit_view", recipe, neon.OPERATINGSTATE_VIEW);

entity/AddAttributesToSelection_entity/AddAttributesToSelection_entity.aod

 <?xml version="1.0" encoding="UTF-8"?>
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.22" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.22">
   <name>AddAttributesToSelection_entity</name>
+  <title>Set attribute</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AddAttributesToSelection_entity/documentation.adoc</documentation>
   <recordContainer>jDito</recordContainer>
@@ -14,9 +15,11 @@
     </entityProvider>
     <entityField>
       <name>UID</name>
+      <state>INVISIBLE</state>
     </entityField>
     <entityField>
       <name>affectedData</name>
+      <title>Affected rows</title>
       <state>DISABLED</state>
       <displayValueProcess>%aditoprj%/entity/AddAttributesToSelection_entity/entityfields/affecteddata/displayValueProcess.js</displayValueProcess>
     </entityField>

entity/AddAttributesToSelection_entity/entityfields/affecteddata/displayValueProcess.js

@@ -2,4 +2,4 @@ import("system.vars");
 import("system.translate");
 import("system.result");
 
-result.string(translate.text("affected rows:") + " " + parseInt(vars.get("$param.Datalength_param"), "#0"));
\ No newline at end of file
+result.string(parseInt(vars.get("$param.Datalength_param"), "#0"));
\ No newline at end of file

entity/AddAttributesToSelection_entity/recordcontainers/jdito/contentProcess.js

@@ -3,5 +3,5 @@ import("system.vars");
 
 if(vars.get("$local.idvalues"))
 {
-result.object([vars.get("$local.idvalues")]);
+    result.object([vars.get("$local.idvalues")]);
 }
\ No newline at end of file

entity/Address_entity/Address_entity.aod

@@ -4,6 +4,7 @@
   <title>Address</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Address_entity/documentation.adoc</documentation>
+  <grantDeleteProcess>%aditoprj%/entity/Address_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/Address_entity/contentTitleProcess.js</contentTitleProcess>
   <afterOperatingState>%aditoprj%/entity/Address_entity/afterOperatingState.js</afterOperatingState>
   <titlePlural>Addresses</titlePlural>
@@ -12,7 +13,7 @@
     <entityField>
       <name>ADDRESS</name>
       <title>Street</title>
-      <mandatory v="true" />
+      <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/address/mandatoryProcess.js</mandatoryProcess>
       <textInputAllowed v="false" />
       <stateProcess>%aditoprj%/entity/Address_entity/entityfields/address/stateProcess.js</stateProcess>
       <titleProcess>%aditoprj%/entity/Address_entity/entityfields/address/titleProcess.js</titleProcess>
@@ -57,7 +58,7 @@
       <name>CITY</name>
       <documentation>%aditoprj%/entity/Address_entity/entityfields/city/documentation.adoc</documentation>
       <title>City</title>
-      <mandatory v="true" />
+      <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/city/mandatoryProcess.js</mandatoryProcess>
       <stateProcess>%aditoprj%/entity/Address_entity/entityfields/city/stateProcess.js</stateProcess>
       <onValueChange>%aditoprj%/entity/Address_entity/entityfields/city/onValueChange.js</onValueChange>
       <onValueChangeTypes>
@@ -109,7 +110,7 @@
     <entityField>
       <name>ZIP</name>
       <title>Postcode</title>
-      <mandatory v="true" />
+      <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/zip/mandatoryProcess.js</mandatoryProcess>
       <stateProcess>%aditoprj%/entity/Address_entity/entityfields/zip/stateProcess.js</stateProcess>
       <onValueChange>%aditoprj%/entity/Address_entity/entityfields/zip/onValueChange.js</onValueChange>
       <onValueChangeTypes>

entity/Address_entity/entityfields/address/mandatoryProcess.js

+import("system.vars");
+import("Entity_lib");
+import("system.result");
+import("AddressEntity_lib");
+
+result.object(AddressEntityValidation.isMandatoryField(vars.get("$field.COUNTRY")));
\ No newline at end of file

entity/Address_entity/entityfields/addresssearch/valueProcess.js

-import("system.logging");
 import("system.result");
 import("WsValidation_lib");
 import("system.vars");

entity/Address_entity/entityfields/city/mandatoryProcess.js

+import("system.vars");
+import("Entity_lib");
+import("system.result");
+import("AddressEntity_lib");
+
+result.object(AddressEntityValidation.isMandatoryField(vars.get("$field.COUNTRY")));
\ No newline at end of file

entity/Address_entity/entityfields/zip/mandatoryProcess.js

+import("system.vars");
+import("Entity_lib");
+import("system.result");
+import("AddressEntity_lib");
+
+result.object(AddressEntityValidation.isMandatoryField(vars.get("$field.COUNTRY")));
\ No newline at end of file

entity/Person_entity/entityfields/salutation/displayValueProcess.js → entity/Address_entity/grantDeleteProcess.js

-import("system.vars");
 import("system.result");
+import("system.vars");
+import("Util_lib");
 
-if(vars.get("$field.SALUTATION"))
-    result.string(vars.get("$field.SALUTATION"));
\ No newline at end of file
+result.string(!Utils.toBoolean(vars.get("$field.IS_STANDARD")));
\ No newline at end of file

entity/AdvertisingItem_entity/entityfields/product_id/displayValueProcess.js

+import("system.neon");
+import("Product_lib");
 import("system.vars");
 import("system.result");
 import("Sql_lib");
 
-if(vars.get("$field.PRODUCT_ID"))
+if(vars.get("$field.PRODUCT_ID") && vars.get("$sys.viewmode") != neon.FRAME_VIEWMODE_TABLE)
 {
-    result.string(newSelect("PRODUCT.PRODUCTNAME").from("PRODUCT").whereIfSet("PRODUCT.PRODUCTID", vars.get("$field.PRODUCT_ID")).cell());
+    result.string(ProductUtils.getProductName(vars.get("$field.PRODUCT_ID")));
 }
\ No newline at end of file

entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js

-import("system.vars");
+import("Product_lib");
 import("system.result");
-import("Sql_lib");
 
-result.string(newSelect("PRODUCT.PRODUCTNAME")
-                        .from("PRODUCT")
-                        .where("ADVERTISINGITEM.PRODUCT_ID = PRODUCT.PRODUCTID")
-                        .toString());
\ No newline at end of file
+result.string(ProductUtils.getProductNameSubSql("ADVERTISINGITEM.PRODUCT_ID"));
+                        
+                        
\ No newline at end of file

entity/Advertising_entity/Advertising_entity.aod

@@ -241,6 +241,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityField>
+      <name>PICTURE</name>
+      <contentType>IMAGE</contentType>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -327,6 +331,10 @@
         <dbRecordFieldMapping>
           <name>OBJECT_ROWID.displayValue</name>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PICTURE.value</name>
+          <expression>%aditoprj%/entity/Advertising_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
       <linkInformation>
         <linkInformation>

entity/Advertising_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js

+import("Product_lib");
+import("Person_lib");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.result");
+import("Sql_lib");
+
+var sqlMask = new SqlMaskingUtils();
+
+var sql = sqlMask.concatenate(["'TEXT:'", "(" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.advertisingStatus(), "ADVERTISING.STATUS") + ")"]);
+
+result.string(sql.toString());
\ No newline at end of file

entity/Analyses_entity/entityfields/opennewtasks/onActionProcess.js

+import("system.neonFilter");
 import("KeywordRegistry_basic");
 import("Sql_lib");
 import("Employee_lib");
@@ -8,5 +9,6 @@ var taskIds = newSelect("TASKID")
     .where("TASK.STATUS", $KeywordRegistry.taskStatus$new())
     .and("TASK.EDITOR_CONTACT_ID", EmployeeUtils.getCurrentContactId())
     .arrayColumn();
-    
-neon.openContext("Task", "TaskFilter_view", taskIds, neon.OPERATINGSTATE_SEARCH, null);
\ No newline at end of file
+
+var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist(taskIds).toString();
+neon.openContextWithRecipe("Task", "TaskFilter_view", recipe, neon.OPERATINGSTATE_SEARCH);

entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js

+import("system.neonFilter");
 import("system.neon");
 import("system.db");
 import("ActivityTask_lib");
@@ -12,4 +13,5 @@ var overdueTask = newSelect("TASKID")
                     .and("TASK.STATUS", TaskUtils.getEndedStatuses(), SqlBuilder.NOT_IN())
                     .array(db.COLUMN)
 
-neon.openContext("Task", "TaskFilter_view", overdueTask, neon.OPERATINGSTATE_SEARCH, null);
\ No newline at end of file
+var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist(overdueTask).toString();
+neon.openContextWithRecipe("Task", "TaskFilter_view", recipe, neon.OPERATINGSTATE_SEARCH);

entity/AroundLocation_entity/entityfields/open/onActionProcess.js

+import("system.neonFilter");
 import("Context_lib");
 import("system.vars");
 import("system.neon");
@@ -38,4 +39,6 @@ var params = {
     MapViewCenterLat_param: vars.get("$param.LocationLat_param"),
     MapViewCenterLon_param: vars.get("$param.LocationLon_param")
 };
-neon.openContext("Organisation", "OrganisationFilter_view", contactIds, neon.OPERATINGSTATE_SEARCH, params, null);
\ No newline at end of file
+
+var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist(contactIds).parameters(params).toString();
+neon.openContextWithRecipe("Organisation", "OrganisationFilter_view", recipe, neon.OPERATINGSTATE_SEARCH);