diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod index 7866082ab397d3cfa3a6d234682575cffe3a5d89..27219b39e5eb32a215a98a0e9a74ed4557f50520 100644 --- a/entity/Campaign_entity/Campaign_entity.aod +++ b/entity/Campaign_entity/Campaign_entity.aod @@ -6,7 +6,7 @@ <title>Campaign</title> <contentTitleProcess>%aditoprj%/entity/Campaign_entity/contentTitleProcess.js</contentTitleProcess> <afterUiInit>%aditoprj%/entity/Campaign_entity/afterUiInit.js</afterUiInit> - <iconId>VAADIN:GROUP</iconId> + <iconId>VAADIN:GROUP</iconId> <imageProcess>%aditoprj%/entity/Campaign_entity/imageProcess.js</imageProcess> <titlePlural>Campaigns</titlePlural> <recordContainer>db</recordContainer> @@ -36,8 +36,8 @@ <title>Start</title> <contentType>DATE</contentType> <resolution>DAY</resolution> - <outputFormat>dd.MM.YYYY</outputFormat> - <inputFormat>dd.MM.YYYY</inputFormat> + <outputFormat></outputFormat> + <inputFormat></inputFormat> <state>READONLY</state> <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/date_start/valueProcess.js</valueProcess> </entityField> @@ -445,6 +445,14 @@ <name>COST.value</name> <expression>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/cost.value/expression.js</expression> </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>DATE_START.value</name> + <expression>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_start.value/expression.js</expression> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>DATE_END.value</name> + <expression>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_end.value/expression.js</expression> + </dbRecordFieldMapping> </recordFieldMappings> </dbRecordContainer> </recordContainers> diff --git a/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_end.value/expression.js b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_end.value/expression.js new file mode 100644 index 0000000000000000000000000000000000000000..ace40927ffdb20b663900cf4e9d2366690e8a66f --- /dev/null +++ b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_end.value/expression.js @@ -0,0 +1,3 @@ +import("system.result"); + +result.string("(select max(DATE_END) from campaignstep where campaign_id = campaignid)"); \ No newline at end of file diff --git a/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_start.value/expression.js b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_start.value/expression.js new file mode 100644 index 0000000000000000000000000000000000000000..bf0fecca3cb5c6eb05471b61c1c89135d7314ffa --- /dev/null +++ b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_start.value/expression.js @@ -0,0 +1,3 @@ +import("system.result"); + +result.string("(select min(DATE_START) from campaignstep where campaign_id = campaignid)"); \ No newline at end of file