diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod index fdb6fb795564c093ceb8b381a8792986cb822700..d94015b2c511c97d6615b82a80d53ffb28ca3df0 100644 --- a/entity/Activity_entity/Activity_entity.aod +++ b/entity/Activity_entity/Activity_entity.aod @@ -531,6 +531,12 @@ </entityParameter> </children> </entityConsumer> + <entityField> + <name>ENTRYYEAR</name> + <title>Entrydate (Year)</title> + <groupable v="true" /> + <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entryyear/valueProcess.js</valueProcess> + </entityField> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/Activity_entity/entityfields/entryyear/valueProcess.js b/entity/Activity_entity/entityfields/entryyear/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..d0a0b4c3271e345217e289de3c0514efe3a6889a --- /dev/null +++ b/entity/Activity_entity/entityfields/entryyear/valueProcess.js @@ -0,0 +1,6 @@ +import("system.datetime"); +import("system.result"); +import("system.vars"); + +var entryDate = vars.get("$field.ENTRYDATE"); +result.string(datetime.toDate(entryDate, "yyyy")); \ No newline at end of file diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod index 62f9bbabc73bf2f542a760fe0eda65c59019d8a3..c215f745c25cf6bf3daee3d3990e3a51539adfee 100644 --- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod +++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod @@ -212,6 +212,16 @@ </entityParameter> </children> </entityConsumer> + <entityField> + <name>STANDARD_EMAIL_COMMUNICATION</name> + <title>E-Mail</title> + <state>READONLY</state> + </entityField> + <entityField> + <name>STANDARD_PHONE_COMMUNICATION</name> + <title>Phone</title> + <state>READONLY</state> + </entityField> </entityFields> <recordContainers> <dbRecordContainer> @@ -269,6 +279,14 @@ <name>ADVERTISINGBAN.value</name> <expression>%aditoprj%/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/recordfieldmappings/advertisingban.value/expression.js</expression> </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>STANDARD_PHONE_COMMUNICATION.displayValue</name> + <expression>%aditoprj%/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/recordfieldmappings/standard_phone_communication.displayvalue/expression.js</expression> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>STANDARD_EMAIL_COMMUNICATION.displayValue</name> + <expression>%aditoprj%/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/recordfieldmappings/standard_email_communication.displayvalue/expression.js</expression> + </dbRecordFieldMapping> </recordFieldMappings> </dbRecordContainer> </recordContainers> diff --git a/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/recordfieldmappings/standard_email_communication.displayvalue/expression.js b/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/recordfieldmappings/standard_email_communication.displayvalue/expression.js new file mode 100644 index 0000000000000000000000000000000000000000..28967142d41b09fd97aa7991b40e836c1248ec95 --- /dev/null +++ b/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/recordfieldmappings/standard_email_communication.displayvalue/expression.js @@ -0,0 +1,6 @@ +import("Sql_lib"); +import("system.result"); +import("Communication_lib"); + +var res = CommUtil.getStandardSubSqlMail(SqlCondition.begin().and("COMMUNICATION.CONTACT_ID = CAMPAIGNPARTICIPANT.CONTACT_ID")); +result.string(res); \ No newline at end of file diff --git a/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/recordfieldmappings/standard_phone_communication.displayvalue/expression.js b/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/recordfieldmappings/standard_phone_communication.displayvalue/expression.js new file mode 100644 index 0000000000000000000000000000000000000000..1b654090c3c0fffd96c2eb836be6cbb10cdb4661 --- /dev/null +++ b/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/recordfieldmappings/standard_phone_communication.displayvalue/expression.js @@ -0,0 +1,5 @@ +import("system.result"); +import("Communication_lib"); + +var res = CommUtil.getStandardSubSqlPhone(SqlCondition.begin().and("COMMUNICATION.CONTACT_ID = CAMPAIGNPARTICIPANT.CONTACT_ID")); +result.string(res); \ No newline at end of file diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index ec77ad9c9837504d26942216a5c28271920d45a2..0823e6b422c5df445db01c400ffe6403417e462e 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -2133,6 +2133,10 @@ <key>Montserrat</key> <value>Montserrat</value> </entry> + <entry> + <key>Entrydate (Year)</key> + <value>Eingangsdatum (Jahr)</value> + </entry> <entry> <key>Guadeloupe</key> <value>Guadeloupe</value> diff --git a/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod b/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod index 240d2d812b910bde5bb2e70c29991a2bca51e819..f977448e5c7f7ed98beca7801fba57935cf694e5 100644 --- a/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod +++ b/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod @@ -30,6 +30,14 @@ <name>1649e2e9-e3b3-4a41-960d-39002cb6b2d8</name> <entityField>CAMPAIGNSTEP_ID</entityField> </neonTableColumn> + <neonTableColumn> + <name>20c9aed5-cf30-484b-a68b-c1f6ca0459db</name> + <entityField>STANDARD_EMAIL_COMMUNICATION</entityField> + </neonTableColumn> + <neonTableColumn> + <name>0071a91d-b716-4ee9-a373-9c8eac9626b8</name> + <entityField>STANDARD_PHONE_COMMUNICATION</entityField> + </neonTableColumn> </columns> </tableViewTemplate> </children>