Skip to content
Snippets Groups Projects
Commit ad94965f authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

Merge branch '1064227_SmallVisitRecommendationFixes' into 'master' 

1064227 small visit recommendation fixes

See merge request xrm/basic!571
parents 6e7ec685 80eff649
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.liquibase/Data_alias/basic/_demoData/generatedData/visitrecommendation.xml
+ 1
− 1
View file @ ad94965f
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<column name="DUE_DATE" valueDate="2020-09-16T12:00:00"/> <column name="DUE_DATE" valueDate="2020-09-16T12:00:00"/>
<column name="SOURCE" value="MANUAL "/> <column name="SOURCE" value="MANUAL "/>
<column name="PRIORITY" value="VISITPRIOCRITICAL "/> <column name="PRIORITY" value="VISITPRIOCRITICAL "/>
<column name="CONTACT_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/> <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
</insert> </insert>
</changeSet> </changeSet>
</databaseChangeLog> </databaseChangeLog>
\ No newline at end of file
entity/Contact_entity/Contact_entity.aod
+ 33
− 33
View file @ ad94965f
...@@ -65,17 +65,17 @@ ...@@ -65,17 +65,17 @@
</entityField> </entityField>
<entityConsumer> <entityConsumer>
<name>Organisations</name> <name>Organisations</name>
<dependency>
<name>dependency</name>
<entityName>Organisation_entity</entityName>
<fieldName>WithPersonIdFilter</fieldName>
</dependency>
<children> <children>
<entityParameter> <entityParameter>
<name>ExcludeOrganisationsByPersonId</name> <name>ExcludeOrganisationsByPersonId</name>
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js</valueProcess> <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js</valueProcess>
</entityParameter> </entityParameter>
</children> </children>
<dependency>
<name>dependency</name>
<entityName>Organisation_entity</entityName>
<fieldName>WithPersonIdFilter</fieldName>
</dependency>
</entityConsumer> </entityConsumer>
<entityParameter> <entityParameter>
<name>PersonId_param</name> <name>PersonId_param</name>
...@@ -86,12 +86,6 @@ ...@@ -86,12 +86,6 @@
<name>PersonRelated</name> <name>PersonRelated</name>
<targetContextField>targetContext</targetContextField> <targetContextField>targetContext</targetContextField>
<targetIdField>CONTACTID</targetIdField> <targetIdField>CONTACTID</targetIdField>
<children>
<entityParameter>
<name>OwnContactId_param</name>
<expose v="false" />
</entityParameter>
</children>
<dependencies> <dependencies>
<entityDependency> <entityDependency>
<name>14975dad-907c-4f8c-bd39-243508ede721</name> <name>14975dad-907c-4f8c-bd39-243508ede721</name>
...@@ -100,6 +94,12 @@ ...@@ -100,6 +94,12 @@
<isConsumer v="false" /> <isConsumer v="false" />
</entityDependency> </entityDependency>
</dependencies> </dependencies>
<children>
<entityParameter>
<name>OwnContactId_param</name>
<expose v="false" />
</entityParameter>
</children>
</entityProvider> </entityProvider>
<entityField> <entityField>
<name>ADDRESS_ID</name> <name>ADDRESS_ID</name>
...@@ -115,31 +115,31 @@ ...@@ -115,31 +115,31 @@
</entityField> </entityField>
<entityConsumer> <entityConsumer>
<name>Communications</name> <name>Communications</name>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency> <dependency>
<name>dependency</name> <name>dependency</name>
<entityName>Communication_entity</entityName> <entityName>Communication_entity</entityName>
<fieldName>AllCommunications</fieldName> <fieldName>AllCommunications</fieldName>
</dependency> </dependency>
</entityConsumer>
<entityConsumer>
<name>ContactAddresses</name>
<children> <children>
<entityParameter> <entityParameter>
<name>ContactId_param</name> <name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/contactaddresses/children/contactid_param/valueProcess.js</valueProcess> <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter> </entityParameter>
</children> </children>
</entityConsumer>
<entityConsumer>
<name>ContactAddresses</name>
<dependency> <dependency>
<name>dependency</name> <name>dependency</name>
<entityName>Address_entity</entityName> <entityName>Address_entity</entityName>
<fieldName>ContactAddresses</fieldName> <fieldName>ContactAddresses</fieldName>
</dependency> </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/contactaddresses/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer> </entityConsumer>
<entityField> <entityField>
<name>LANGUAGE</name> <name>LANGUAGE</name>
...@@ -163,13 +163,6 @@ ...@@ -163,13 +163,6 @@
<targetContextField>targetContext</targetContextField> <targetContextField>targetContext</targetContextField>
<targetIdField>CONTACTID</targetIdField> <targetIdField>CONTACTID</targetIdField>
<titlePlural>Other Contactroles</titlePlural> <titlePlural>Other Contactroles</titlePlural>
<children>
<entityParameter>
<name>PersonId_param</name>
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/personscontactsexceptown/children/personid_param/valueProcess.js</valueProcess>
<expose v="false" />
</entityParameter>
</children>
<dependencies> <dependencies>
<entityDependency> <entityDependency>
<name>34cc85f4-5555-4631-94fc-f3ad35b7ce7e</name> <name>34cc85f4-5555-4631-94fc-f3ad35b7ce7e</name>
...@@ -178,6 +171,13 @@ ...@@ -178,6 +171,13 @@
<isConsumer v="false" /> <isConsumer v="false" />
</entityDependency> </entityDependency>
</dependencies> </dependencies>
<children>
<entityParameter>
<name>PersonId_param</name>
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/personscontactsexceptown/children/personid_param/valueProcess.js</valueProcess>
<expose v="false" />
</entityParameter>
</children>
</entityProvider> </entityProvider>
<entityParameter> <entityParameter>
<name>OwnContactId_param</name> <name>OwnContactId_param</name>
...@@ -198,17 +198,17 @@ ...@@ -198,17 +198,17 @@
</entityField> </entityField>
<entityConsumer> <entityConsumer>
<name>KeywordContactStates</name> <name>KeywordContactStates</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children> <children>
<entityParameter> <entityParameter>
<name>ContainerName_param</name> <name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js</valueProcess> <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js</valueProcess>
</entityParameter> </entityParameter>
</children> </children>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
</entityConsumer> </entityConsumer>
<entityParameter> <entityParameter>
<name>LanguageKey_param</name> <name>LanguageKey_param</name>
......
entity/VisitRecommendation_entity/initFilterProcess.js
+ 1
− 1
View file @ ad94965f
...@@ -6,7 +6,7 @@ import("KeywordRegistry_basic"); ...@@ -6,7 +6,7 @@ import("KeywordRegistry_basic");
import("system.result"); import("system.result");
import("Employee_lib"); import("Employee_lib");
var res;
if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER) if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER)
{ {
var sourceKey = $KeywordRegistry.visitRecommendationPrioSource$manual() var sourceKey = $KeywordRegistry.visitRecommendationPrioSource$manual()
......
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