Skip to content
Snippets Groups Projects
Commit 5a29c138 authored by c.wimmer's avatar c.wimmer
Browse files

[Projekt: Crowd-Development / Besuch vor Ort][TicketNr.: 1066694][Farben und... 

[Projekt: Crowd-Development / Besuch vor Ort][TicketNr.: 1066694][Farben und Icons für Besuch vor Ort]
parent ff435d5e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 43 additions and 38 deletions
entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
+ 24
− 23
View file @ 5a29c138
......@@ -3,6 +3,7 @@
<name>VisitRecommendation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/VisitRecommendation_entity/documentation.adoc</documentation>
<iconProcess>%aditoprj%/entity/VisitRecommendation_entity/iconProcess.js</iconProcess>
<title>Visit Recommendation</title>
<grantCreate v="true" />
<iconId>VAADIN:BRIEFCASE</iconId>
......@@ -83,11 +84,6 @@
<entityConsumer>
<name>KeywordVisitRecommendationPriority</name>
<documentation>%aditoprj%/entity/VisitRecommendation_entity/entityfields/keywordvisitrecommendationpriority/documentation.adoc</documentation>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
......@@ -95,6 +91,11 @@
<expose v="true" />
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>OrganisationConsumer</name>
......@@ -106,11 +107,6 @@
</entityConsumer>
<entityConsumer>
<name>PersonConsumer</name>
<dependency>
<name>dependency</name>
<entityName>Person_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
......@@ -123,6 +119,11 @@
<expose v="true" />
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Person_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
<entityParameter>
<name>ContactId_param</name>
......@@ -144,11 +145,11 @@
</children>
</entityActionGroup>
<entityField>
<name>PRIORITY_ICON</name>
<name>ICON</name>
<title></title>
<colorProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/priority_icon/colorProcess.js</colorProcess>
<colorProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/icon/colorProcess.js</colorProcess>
<contentType>IMAGE</contentType>
<valueProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/priority_icon/valueProcess.js</valueProcess>
<valueProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>TARGET_CONTEXT</name>
......@@ -177,17 +178,17 @@
</entityProvider>
<entityConsumer>
<name>KeywordVisitRecommendationSource</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/keywordvisitrecommendationsource/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
</entityConsumer>
<entityParameter>
<name>ContactIdPerson_param</name>
......@@ -204,17 +205,17 @@
</entityField>
<entityConsumer>
<name>Employees</name>
<dependency>
<name>dependency</name>
<entityName>Employee_entity</entityName>
<fieldName>Employees</fieldName>
</dependency>
<children>
<entityParameter>
<name>OnlyActives_param</name>
<valueProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/employees/children/onlyactives_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Employee_entity</entityName>
<fieldName>Employees</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>STREET</name>
......
entity/VisitRecommendation_entity/entityfields/priority_icon/colorProcess.js → entity/VisitRecommendation_entity/entityfields/icon/colorProcess.js
+ 4
− 7
View file @ 5a29c138
......@@ -5,20 +5,17 @@ import("system.neon");
switch(vars.getString("$field.PRIORITY"))
{
case $KeywordRegistry.taskPriority$none():
result.string(neon.PRIORITY_NONE_COLOR);
break;
case $KeywordRegistry.visitRecommendationPriority$low():
result.string(neon.PRIORITY_LOW_COLOR);
result.string(neon.PRIORITY_NONE_COLOR);
break;
case $KeywordRegistry.visitRecommendationPriority$medium():
result.string(neon.PRIORITY_MEDIUM_COLOR);
result.string(neon.PRIORITY_LOW_COLOR);
break;
case $KeywordRegistry.visitRecommendationPriority$high():
result.string(neon.PRIORITY_HIGH_COLOR);
result.string(neon.PRIORITY_MEDIUM_COLOR);
break;
case $KeywordRegistry.visitRecommendationPriority$veryHigh():
result.string(neon.PRIORITY_HIGH_COLOR);
result.string(neon.PRIORITY_MEDIUM_COLOR);
break;
case $KeywordRegistry.visitRecommendationPriority$critical():
result.string(neon.PRIORITY_HIGH_COLOR);
......
entity/VisitRecommendation_entity/entityfields/icon/valueProcess.js 0 → 100644
+ 12
− 0
View file @ 5a29c138
import("system.logging");
import("system.vars");
import("Keyword_lib");
import("ActivityTask_lib");
import("KeywordRegistry_basic");
import("system.result");
var source = vars.get("$field.PRIORITY_SOURCE");
if(source== "MANUAL")
result.string("NEON:CONVERSATION_PLANNING_MANUAL");
else if(source== "VISITFREQUENCY")
result.string("NEON:CONVERSATION_PLANNING_FREQUENCY");
entity/VisitRecommendation_entity/entityfields/priority_icon/valueProcess.js deleted 100644 → 0
+ 0
− 5
View file @ ff435d5e
import("ActivityTask_lib");
import("KeywordRegistry_basic");
import("system.result");
result.string(TaskUtils.getStatusIcon($KeywordRegistry.taskStatus$new));
\ No newline at end of file
neonView/VisitRecommendationFilter_view/VisitRecommendationFilter_view.aod
+ 3
− 3
View file @ 5a29c138
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.7">
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
<name>VisitRecommendationFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
......@@ -19,7 +19,7 @@
<columns>
<neonTableColumn>
<name>a87306f5-45b1-4969-ab2b-c6d17b54c4de</name>
<entityField>PRIORITY_ICON</entityField>
<entityField>ICON</entityField>
</neonTableColumn>
<neonTableColumn>
<name>44659323-f1b5-4b29-afbf-eac2e7219e30</name>
......@@ -78,7 +78,7 @@
<columns>
<neonTreeTableColumn>
<name>297bae8e-4d8c-4fbf-90fb-240369d48ff9</name>
<entityField>PRIORITY_ICON</entityField>
<entityField>ICON</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>621b2bf8-280a-4bd8-9a09-9cad5bdcda0e</name>
......
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