Merge branch 'sales_1082589_FixTileViewBooleanFields' into '2021.2.0'

[Projekt: xRM-Sales][TicketNr.: 1082589][Kacheldarstellung enthält keine Info...

See merge request xrm/basic!1281

entity/Product_entity/Product_entity.aod

@@ -544,6 +544,14 @@
       <name>AdvertisingProducts_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityField>
+      <name>STATUS_TILEVIEW</name>
+      <documentation>%aditoprj%/entity/Product_entity/entityfields/status_tileview/documentation.adoc</documentation>
+    </entityField>
+    <entityField>
+      <name>ADVERTISING_TILEVIEW</name>
+      <documentation>%aditoprj%/entity/Product_entity/entityfields/advertising_tileview/documentation.adoc</documentation>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -654,6 +662,20 @@
           <name>DIGITAL.value</name>
           <recordfield>PRODUCT.DIGITAL</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS_TILEVIEW.value</name>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS_TILEVIEW.displayValue</name>
+          <expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/statustileview.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ADVERTISING_TILEVIEW.value</name>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ADVERTISING_TILEVIEW.displayValue</name>
+          <expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/advertising_tileview.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
       <linkInformation>
         <linkInformation>

entity/Product_entity/entityfields/advertising_tileview/documentation.adoc

+= ADVERTISING_TILEVIEW
+
+This only exists to provide a displayvlaue for the tileview template.
+Reason being that said template doesn't display the columntitle so only displaying yes/no doesn't help the user in any way, instead we want to display "Advertising material" if true and nothing if false.
\ No newline at end of file

entity/Product_entity/entityfields/status_tileview/documentation.adoc

+= STATUS_TILEVIEW
+
+This only exists to provide a displayvlaue for the tileview template.
+Reason being that said template doesn't display the columntitle so only displaying yes/no doesn't help the user in any way, instead we want to display "Active"/"Inacitve"
\ No newline at end of file

entity/Product_entity/recordcontainers/db/recordfieldmappings/advertising_tileview.displayvalue/expression.js

+import("system.translate");
+import("Sql_lib");
+import("system.result");
+
+result.string(SqlBuilder.caseWhen(newWhere("PRODUCT.ADVERTISING", "Y")).thenString(translate.text("Advertising material")).toString());
\ No newline at end of file

entity/Product_entity/recordcontainers/db/recordfieldmappings/statustileview.displayvalue/expression.js

+import("system.translate");
+import("Sql_lib");
+import("system.result");
+
+result.string(SqlBuilder.caseWhen(newWhere("PRODUCT.STATUS", "1")).thenString(translate.text("Active")).elseString(translate.text("Inactive")).toString());
\ No newline at end of file

neonView/ProductFilter_view/ProductFilter_view.aod

@@ -36,7 +36,8 @@
       <iconField>#IMAGE</iconField>
       <titleField>PRODUCTNAME</titleField>
       <subtitleField>GROUPCODEID</subtitleField>
-      <descriptionField>STATUS</descriptionField>
+      <descriptionField>STATUS_TILEVIEW</descriptionField>
+      <infoBottomField>ADVERTISING_TILEVIEW</infoBottomField>
       <tilePresentation>PORTRAIT</tilePresentation>
       <entityField>#ENTITY</entityField>
       <favoriteActionGroup1>observeActionGroup</favoriteActionGroup1>