Skip to content
Snippets Groups Projects
Commit 1023a962 authored by Florian Maier's avatar Florian Maier
Browse files

[Projekt: xRM-ContactManagement][TicketNr.: 2001606][Bild-Spalte in Tabellen mitaufnehmen]

parent 03c32b5d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 115 additions and 23 deletions
entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js
+ 2
− 1
View file @ 1023a962
import("Product_lib");
import("system.vars");
import("system.result");
// TODO: remove when #title is used as display value for lookups
result.string("(select PRODUCT.PRODUCTNAME from PRODUCT where OFFERITEM.PRODUCT_ID = PRODUCT.PRODUCTID)");
\ No newline at end of file
result.string(ProductUtils.getProductNameSubSql("OFFERITEM.PRODUCT_ID"));
\ No newline at end of file
entity/Orderitem_entity/Orderitem_entity.aod
+ 8
− 0
View file @ 1023a962
......@@ -278,6 +278,10 @@
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/currency/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -368,6 +372,10 @@
<isFilterable v="true" />
<isLookupFilter v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PICTURE.value</name>
<expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
entity/Orderitem_entity/entityfields/product_id/displayValueProcess.js
+ 6
− 2
View file @ 1023a962
import("Product_lib");
import("system.neon");
import("system.vars");
import("system.result");
import("Sql_lib");
if(vars.get("$field.PRODUCT_ID"))
result.string(newSelect("PRODUCT.PRODUCTNAME").from("PRODUCT").whereIfSet("PRODUCT.PRODUCTID", vars.get("$field.PRODUCT_ID")).cell());
\ No newline at end of file
if(vars.get("$field.PRODUCT_ID") && vars.get("$sys.viewmode") != neon.FRAME_VIEWMODE_TABLE)
{
result.string(ProductUtils.getProductName(vars.get("$field.PRODUCT_ID")));
}
\ No newline at end of file
entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js 0 → 100644
+ 12
− 0
View file @ 1023a962
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:'", "(" + ProductUtils.getProductNameSubSql("SALESORDERITEM.PRODUCT_ID") + ")"]);
result.string(sql.toString());
\ No newline at end of file
entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js
+ 2
− 1
View file @ 1023a962
import("Product_lib");
import("system.vars");
import("system.result");
// TODO: remove when #title is used as display value for lookups
result.string("(select PRODUCT.PRODUCTNAME from PRODUCT where SALESORDERITEM.PRODUCT_ID = PRODUCT.PRODUCTID)");
\ No newline at end of file
result.string(ProductUtils.getProductNameSubSql("SALESORDERITEM.PRODUCT_ID"));
\ No newline at end of file
entity/Planning_entity/Planning_entity.aod
+ 8
− 0
View file @ 1023a962
......@@ -197,6 +197,10 @@
<name>PlanningIds_param</name>
<expose v="true" />
</entityParameter>
<entityField>
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -259,6 +263,10 @@
<name>GROUPCODE.displayValue</name>
<expression>%aditoprj%/entity/Planning_entity/recordcontainers/db/recordfieldmappings/groupcode.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PICTURE.value</name>
<expression>%aditoprj%/entity/Planning_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
entity/Planning_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js 0 → 100644
+ 10
− 0
View file @ 1023a962
import("KeywordRegistry_basic");
import("Keyword_lib");
import("system.result");
import("Sql_lib");
var sqlMask = new SqlMaskingUtils();
var sql = sqlMask.concatenate(["'TEXT:'", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.forecastStatus(), "FORECAST.STATUS")]);
result.string(sql.toString());
\ No newline at end of file
entity/Prod2prod_entity/Prod2prod_entity.aod
+ 7
− 0
View file @ 1023a962
......@@ -140,6 +140,10 @@
<entityField>
<name>UID</name>
</entityField>
<entityField>
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
......@@ -190,6 +194,9 @@
<jDitoRecordFieldMapping>
<name>unit.displayValue</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>PICTURE.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>currentPurchasePrice.value</name>
</jDitoRecordFieldMapping>
......
entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
+ 4
− 1
View file @ 1023a962
......@@ -7,6 +7,8 @@ import("Sql_lib");
import("Keyword_lib");
import("KeywordRegistry_basic");
var sqlMask = new SqlMaskingUtils();
var query = newSelect([
"PROD2PROD.PROD2PRODID", // UID.value
"PROD2PROD.PROD2PRODID", // PROD2PRODID.value
......@@ -23,7 +25,8 @@ var query = newSelect([
KeywordUtils.getResolvedTitleSqlPart( // unit.displaValue
$KeywordRegistry.quantityUnit(),
"PRODUCT.UNIT"
)
),
sqlMask.concatenate(["'TEXT:'", "PRODUCT.PRODUCTCODE"])
]).from("PROD2PROD")
.join("PRODUCT", "PRODUCT.PRODUCTID = PROD2PROD.SOURCE_ID");
......
entity/Timetracking_entity/Timetracking_entity.aod
+ 8
− 0
View file @ 1023a962
......@@ -114,6 +114,10 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
<entityField>
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -154,6 +158,10 @@
<name>TRACKINGMINUTES.value</name>
<recordfield>TIMETRACKING.TRACKINGMINUTES</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PICTURE.value</name>
<expression>%aditoprj%/entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js
+ 1
− 1
View file @ 1023a962
import("system.result");
import("Person_lib");
result.string(PersUtils.getResolvingDisplaySubSql("CONTACT_ID"))
\ No newline at end of file
result.string(PersUtils.getResolvingDisplaySubSql("CONTACT_ID"));
\ No newline at end of file
entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js 0 → 100644
+ 14
− 0
View file @ 1023a962
import("Person_lib");
import("KeywordRegistry_basic");
import("Keyword_lib");
import("system.result");
import("Sql_lib");
var sqlMask = new SqlMaskingUtils();
var sql = sqlMask.concatenate(["'TEXT:'", "(" + newSelect(sqlMask.concatenate(["FIRSTNAME, ' ', LASTNAME"]))
.from("PERSON")
.join("CONTACT", "PERSON_ID = PERSONID")
.where("CONTACT.CONTACTID = TIMETRACKING.CONTACT_ID") + ")"]);
result.string(sql.toString());
\ No newline at end of file
neonView/AdvertisingFilter_view/AdvertisingFilter_view.aod
+ 1
− 1
View file @ 1023a962
......@@ -16,7 +16,7 @@
<columns>
<neonTableColumn>
<name>8c3e1048-7f7a-4210-a849-198f5b569c04</name>
<entityField>#ICON</entityField>
<entityField>PICTURE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>b8971987-29bb-48dc-b9fc-075a63ef0b4e</name>
......
neonView/AdvertisingPreview_view/AdvertisingPreview_view.aod
+ 1
− 1
View file @ 1023a962
......@@ -11,7 +11,7 @@
<children>
<cardViewTemplate>
<name>Card</name>
<iconField>#ICON</iconField>
<iconField>PICTURE</iconField>
<titleField>STATUS</titleField>
<subtitleField>CONTACT_ID</subtitleField>
<descriptionField>RESPONSIBLE_ID</descriptionField>
......
neonView/CommunicationSettingsFilter_view/CommunicationSettingsFilter_view.aod
+ 1
− 1
View file @ 1023a962
......@@ -14,7 +14,7 @@
<columns>
<neonTreeTableColumn>
<name>1e698c64-ce5c-46d1-8c90-290d5ea187c7</name>
<entityField>ICON</entityField>
<entityField>PICTURE</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>5738f47a-57cd-4e6a-a017-1a5ab80581ac</name>
......
neonView/CommunicationSettingsPreview_view/CommunicationSettingsPreview_view.aod
+ 1
− 1
View file @ 1023a962
......@@ -11,7 +11,7 @@
<children>
<cardViewTemplate>
<name>Card</name>
<iconField>ICON</iconField>
<iconField>PICTURE</iconField>
<titleField>#CONTENTTITLE</titleField>
<subtitleField>STATUS</subtitleField>
<isEditable v="false" />
......
neonView/ContactList_view/ContactList_view.aod
+ 4
− 0
View file @ 1023a962
......@@ -15,6 +15,10 @@
<isDeletable v="false" />
<isEditable v="false" />
<columns>
<neonTableColumn>
<name>5c3b4a01-f8d6-45df-92aa-8e39c94789f5</name>
<entityField>PICTURE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>ef71b5ad-8581-4845-ae66-7df17d1459e0</name>
<entityField>ORGANISATION_CONTACTID</entityField>
......
neonView/DescriptionTranslationFilter_view/DescriptionTranslationFilter_view.aod
+ 8
− 0
View file @ 1023a962
......@@ -12,6 +12,10 @@
<name>translation</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
<name>b33e3ff8-ec3a-4d5d-8961-3b18175502a3</name>
<entityField>PICTURE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>4bdaf352-d5f1-44a1-9cca-7cb877928ba5</name>
<entityField>LANG</entityField>
......@@ -26,6 +30,10 @@
<name>Treetable</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTreeTableColumn>
<name>5303f922-1e77-48db-94b3-f803e10f91c3</name>
<entityField>PICTURE</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>a9046b9c-0324-4e19-a22b-ae39c6a1c8c4</name>
<entityField>LANG</entityField>
......
neonView/DescriptionTranslationPreview_view/DescriptionTranslationPreview_view.aod
+ 5
− 13
View file @ 1023a962
......@@ -10,19 +10,11 @@
</boxLayout>
</layout>
<children>
<genericViewTemplate>
<name>TranslationInfo</name>
<showDrawer v="true" />
<drawerCaption>Description</drawerCaption>
<hideLabels v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>5e432839-ca9a-4a29-8006-0a1673d94c92</name>
<entityField>LANG</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<cardViewTemplate>
<name>Card</name>
<iconField>PICTURE</iconField>
<titleField>LANG</titleField>
</cardViewTemplate>
<genericViewTemplate>
<name>Description</name>
<showDrawer v="true" />
......
neonView/ForecastFilter_view/ForecastFilter_view.aod
+ 12
− 0
View file @ 1023a962
......@@ -18,6 +18,10 @@
<element>INFO</element>
</editableColumns>
<columns>
<neonTableColumn>
<name>68de81f0-00c6-4e11-a8d3-2922a202a1b0</name>
<entityField>PICTURE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>ed63515d-4c7b-4e40-92b0-81fa1395b0f1</name>
<entityField>GROUPCODE</entityField>
......@@ -50,6 +54,10 @@
<subtitleField>VOLUME</subtitleField>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
<name>b7acab7d-5e92-45b5-9b41-e653ee1e5679</name>
<entityField>PICTURE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>323f26d7-4ac2-4ff9-91d1-7459cc7e3469</name>
<entityField>GROUPCODE</entityField>
......@@ -72,6 +80,10 @@
<name>Treetable</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTreeTableColumn>
<name>a6a83c1c-6ea0-4f06-bf8a-8d6b071b1a64</name>
<entityField>PICTURE</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>9bdb1cf9-5348-464d-84fb-747d509b0eef</name>
<entityField>GROUPCODE</entityField>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment