Skip to content
Snippets Groups Projects
Commit 533332cc authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

activity-direction icons: add to keyword and add internal-icon

parent 4d0aa082
No related branches found
No related tags found
No related merge requests found
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="j-hoermann" id="1599ef6a-6293-40e3-8d6c-6ddfe1028e5e">
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="e187a585-9ab1-4dd4-a2e9-2db14d4cc3a7"/>
<column name="NAME" value="icon"/>
<column name="CONTAINER" value="ActivityDirection"/>
<column name="TYPE" value="CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="7770bafa-22f0-4a74-a2cf-5001b620a4b2"/>
<column name="AB_KEYWORD_ENTRY_ID" value="c564719a-18ef-4b9e-b130-dde8b2b518ad"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="e187a585-9ab1-4dd4-a2e9-2db14d4cc3a7"/>
<column name="CHAR_VALUE" value="VAADIN:ARROW_BACKWARD"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="d2ad222a-7a5f-4d4d-ae8c-578ad3359d24"/>
<column name="AB_KEYWORD_ENTRY_ID" value="6f4c6e49-36ca-4b91-ba83-c507203e1eac"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="e187a585-9ab1-4dd4-a2e9-2db14d4cc3a7"/>
<column name="CHAR_VALUE" value="VAADIN:ARROW_FORWARD"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="e82923a6-5245-4d42-871b-91df297bc2ee"/>
<column name="AB_KEYWORD_ENTRY_ID" value="bb386131-ee36-4835-b458-6751f137a941"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="e187a585-9ab1-4dd4-a2e9-2db14d4cc3a7"/>
<column name="CHAR_VALUE" value="VAADIN:SHOP"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
......@@ -154,4 +154,6 @@
<include relativeToChangelogFile="true" file="CampaignManagement/create_campaignStepState.xml"/>
<include relativeToChangelogFile="true" file="CampaignManagement/create_campaignCost.xml"/>
<include relativeToChangelogFile="true" file="CampaignManagement/create_campaignCostCategory.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/ActivityDirectionKeyword_add_icon_attr.xml"/>
</databaseChangeLog>
......@@ -6,6 +6,7 @@
<documentation>%aditoprj%/entity/Activity_entity/documentation.adoc</documentation>
<afterUiInit>%aditoprj%/entity/Activity_entity/afterUiInit.js</afterUiInit>
<iconId>NEON:HISTORY</iconId>
<image>VAADIN:SHOP</image>
<imageProcess>%aditoprj%/entity/Activity_entity/imageProcess.js</imageProcess>
<recordContainer>db</recordContainer>
<entityFields>
......
......@@ -2,20 +2,30 @@ import("system.vars");
import("system.result");
import("system.neon");
import("KeywordRegistry_basic");
import("Keyword_lib");
var direction = vars.getString("$field.DIRECTION");
var res;
switch (direction)
if (direction)
{
case $KeywordRegistry.activityDirection$incoming():
res = "VAADIN:ARROW_BACKWARD";
break;
case $KeywordRegistry.activityDirection$outgoing():
res = "VAADIN:ARROW_FORWARD";
break;
default:
res = "";
break;
}
// cache to prevent multiple loading of the same icon-names
if (vars.exists("$context.cache_activity_dir-icon_" + direction) && vars.get("$context.cache_activity_dir-icon_" + direction))
{
result.string(vars.get("$context.cache_activity_dir-icon_" + direction));
}
else
{
var res = KeywordUtils.getAttributeRelationsByKey(direction, $KeywordRegistry.activityDirection())["icon"];
result.string(res);
if (res)
{
result.string(res);
vars.set("$context.cache_activity_dir-icon_" + direction, res);
}
else
{
result.string("");
vars.set("$context.cache_activity_dir-icon_" + direction, "");
}
}
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment