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 154 additions and 25 deletions
entity/AdvertisingItem_entity/entityfields/product_id/displayValueProcess.js
+ 4
− 2
View file @ 1023a962
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
+ 4
− 6
View file @ 1023a962
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
+ 8
− 0
View file @ 1023a962
......@@ -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 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:'", "(" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.advertisingStatus(), "ADVERTISING.STATUS") + ")"]);
result.string(sql.toString());
\ No newline at end of file
entity/CommunicationSettings_entity/CommunicationSettings_entity.aod
+ 8
− 0
View file @ 1023a962
......@@ -213,6 +213,10 @@
<contentType>BOOLEAN</contentType>
<valueProcess>%aditoprj%/entity/CommunicationSettings_entity/entityfields/isactive/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -319,6 +323,10 @@
<recordfield>COMMUNICATIONSETTINGS.ISACTIVE</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PICTURE.value</name>
<expression>%aditoprj%/entity/CommunicationSettings_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
entity/CommunicationSettings_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js 0 → 100644
+ 13
− 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:'",
"(" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.communicationSettingStatus(), "COMMUNICATIONSETTINGS.STATUS") + ")"]);
result.string(sql.toString());
\ No newline at end of file
entity/Contact_entity/Contact_entity.aod
+ 8
− 0
View file @ 1023a962
......@@ -275,6 +275,10 @@
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -367,6 +371,10 @@
<name>DEPARTMENT.displayValue</name>
<expression>%aditoprj%/entity/Contact_entity/recordcontainers/db/recordfieldmappings/department.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PICTURE.value</name>
<expression>%aditoprj%/entity/Contact_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
entity/Contact_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:'", "ORGANISATION.NAME"]);
result.string(sql.toString());
\ No newline at end of file
entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
+ 8
− 0
View file @ 1023a962
......@@ -69,6 +69,10 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
<entityField>
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -100,6 +104,10 @@
<name>LANG.displayValue</name>
<expression>%aditoprj%/entity/DescriptionTranslation_entity/recordcontainers/db/recordfieldmappings/lang.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PICTURE.value</name>
<expression>%aditoprj%/entity/DescriptionTranslation_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
entity/DescriptionTranslation_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:'", "(" + LanguageKeywordUtils.getResolvedTitleSqlPart("DESCRIPTIONTRANSLATION.LANG") + ")"]);
result.string(sql.toString());
entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
+ 1
− 1
View file @ 1023a962
......@@ -88,7 +88,7 @@
<entityField>
<name>exportCount</name>
<documentation>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exportcount/documentation.adoc</documentation>
<titleProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exportcount/titleProcess.js</titleProcess>
<title>Datasets are exported</title>
<valueProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exportcount/valueProcess.js</valueProcess>
</entityField>
<entityProvider>
......
entity/ExportTemplateSelection_entity/entityfields/exportcount/titleProcess.js deleted 100644 → 0
+ 0
− 13
View file @ 03c32b5d
import("system.translate");
import("system.result");
import("system.vars");
var comingFrom = vars.get("$field.comingfrom")
var res
if(comingFrom == "Organisation")
res = translate.text("Organisations will be exported");
else if(comingFrom == "Person")
res = translate.text("Contacts will be exported");
result.string(res)
\ No newline at end of file
entity/ExportTemplate_entity/ExportTemplate_entity.aod
+ 0
− 1
View file @ 1023a962
......@@ -185,7 +185,6 @@
</entityConsumer>
<entityField>
<name>PICTURE</name>
<title>Picture</title>
<contentType>IMAGE</contentType>
</entityField>
</entityFields>
......
entity/Forecast_entity/Forecast_entity.aod
+ 8
− 0
View file @ 1023a962
......@@ -123,6 +123,10 @@
<name>KIND</name>
<valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/kind/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -177,6 +181,10 @@
<name>KIND.value</name>
<recordfield>FORECAST.KIND</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PICTURE.value</name>
<expression>%aditoprj%/entity/Forecast_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
entity/Forecast_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.productGroupcode(), "FORECAST.GROUPCODE")]);
result.string(sql.toString());
\ No newline at end of file
entity/InterestLink_entity/InterestLink_entity.aod
+ 8
− 0
View file @ 1023a962
......@@ -100,6 +100,10 @@
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/InterestLink_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
<entityField>
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -154,6 +158,10 @@
<name>DATE_NEW.value</name>
<recordfield>INTERESTLINK.DATE_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PICTURE.value</name>
<expression>%aditoprj%/entity/InterestLink_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
entity/InterestLink_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:'", "INTEREST.TITLE"]);
result.string(sql.toString());
\ No newline at end of file
entity/Offeritem_entity/Offeritem_entity.aod
+ 8
− 0
View file @ 1023a962
......@@ -296,6 +296,10 @@
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/currency/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -408,6 +412,10 @@
<name>DISCOUNT.displayValue</name>
<expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/discount.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PICTURE.value</name>
<expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
entity/Offeritem_entity/entityfields/product_id/displayValueProcess.js
+ 6
− 2
View file @ 1023a962
import("system.neon");
import("Product_lib");
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/Offeritem_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("OFFERITEM.PRODUCT_ID") + ")"]);
result.string(sql.toString());
\ No newline at end of file
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