Skip to content
Snippets Groups Projects
Commit 1435641d authored by Sophia Leierseder's avatar Sophia Leierseder
Browse files

Icons for salesproject touchpoints and timetracking scorecard

parent 76d4eb05
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 73 additions and 12 deletions
.liquibase/Data_alias/basic/2019.2/AditoBasic/salesprojectsource_add_icon_attr.xml 0 → 100644
+ 37
− 0
View file @ 1435641d
<?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="s.leierseder" id="49ca80b4-7735-4300-8603-6761672b2048">
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="4b05ec8a-6964-40e5-8713-0043ca926eb6"/>
<column name="NAME" value="defaultAvatarRepresentation"/>
<column name="CONTAINER" value="SalesprojectSource"/>
<column name="TYPE" value="CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="4a6b782b-1b15-45d7-9acb-831312d3f745"/>
<column name="AB_KEYWORD_ENTRY_ID" value="f83c96e3-47be-4ca1-bc47-4a3a2fce7fca"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="4b05ec8a-6964-40e5-8713-0043ca926eb6"/>
<column name="CHAR_VALUE" value="VAADIN:GLOBE_WIRE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="f3b79959-00e3-4361-b042-6c179dc6cbca"/>
<column name="AB_KEYWORD_ENTRY_ID" value="1a197ade-0c61-4643-8287-159719d519b4"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="4b05ec8a-6964-40e5-8713-0043ca926eb6"/>
<column name="CHAR_VALUE" value="VAADIN:HOME"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="54c417d8-e567-41ae-8d56-277559f7b023"/>
<column name="AB_KEYWORD_ENTRY_ID" value="f552b84a-b8e7-472a-9ce5-d64e7f14e74b"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="4b05ec8a-6964-40e5-8713-0043ca926eb6"/>
<column name="CHAR_VALUE" value="VAADIN:HOME"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="a6157376-f0af-49f2-b55e-5c0acc331742"/>
<column name="AB_KEYWORD_ENTRY_ID" value="7ea06933-94c9-4a05-ba7d-4266df9e4ab2"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="4b05ec8a-6964-40e5-8713-0043ca926eb6"/>
<column name="CHAR_VALUE" value="VAADIN:SHOP"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2019.2/changelog.xml
+ 3
− 0
View file @ 1435641d
......@@ -184,4 +184,7 @@
<include relativeToChangelogFile="true" file="Ticketmanagement/insertTicketAttributes_TaskType_Task.xml"/>
<include relativeToChangelogFile="true" file="Ticketmanagement/insert_TaskType_Task.xml"/>
<include relativeToChangelogFile="true" file="Ticketmanagement/update_TaskStatus_add_icon.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/salesprojectsource_add_icon_attr.xml"/>
</databaseChangeLog>
entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+ 6
− 0
View file @ 1435641d
......@@ -3,6 +3,7 @@
<name>SalesprojectSource_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Touchpoint</title>
<iconId>VAADIN:HANDSHAKE</iconId>
<titlePlural>Touchpoints</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
......@@ -76,6 +77,11 @@
<title>Information</title>
<contentType>LONG_TEXT</contentType>
</entityField>
<entityField>
<name>ICON</name>
<contentType>IMAGE</contentType>
<valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/SalesprojectSource_entity/entityfields/icon/valueProcess.js 0 → 100644
+ 14
− 0
View file @ 1435641d
import("system.vars");
import("system.result");
import("system.neon");
import("Keyword_lib");
import("KeywordRegistry_basic");
var category = vars.getString("$field.SOURCE");
var icon;
if (category)
{
var keywordAttributes = KeywordUtils.getAttributeRelationsByKey(category, $KeywordRegistry.salesprojectSource())
icon = keywordAttributes.defaultAvatarRepresentation;
result.string(icon);
}
entity/Timetracking_entity/entityfields/totaltime/valueProcess.js
+ 3
− 5
View file @ 1435641d
import("system.logging");
import("system.db");
import("system.vars");
import("system.result");
var minutes = vars.get("$field.MINUTES");
var minutes = db.cell("select sum(MINUTES) from TIMETRACKING");
logging.log(minutes);
result.string("120");
\ No newline at end of file
result.string(minutes);
\ No newline at end of file
neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
+ 1
− 2
View file @ 1435641d
......@@ -6,9 +6,8 @@
<layout>
<boxLayout>
<name>layout</name>
<direction>HORIZONTAL</direction>
<direction>VERTICAL</direction>
<maxDirectionElements v="2" />
<autoHeight v="false" />
</boxLayout>
</layout>
<children>
......
neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod
+ 5
− 5
View file @ 1435641d
......@@ -12,15 +12,15 @@
</boxLayout>
</layout>
<children>
<neonViewReference>
<name>5e9b2286-227e-494d-a252-be29a50a093a</name>
<entityField>Activities</entityField>
<view>ActivityDrawer_view</view>
</neonViewReference>
<neonViewReference>
<name>ebf752f4-653d-4de3-9c81-c3e6ef692c48</name>
<entityField>Members</entityField>
<view>MemberDrawer_view</view>
</neonViewReference>
<neonViewReference>
<name>5e9b2286-227e-494d-a252-be29a50a093a</name>
<entityField>Activities</entityField>
<view>ActivityDrawer_view</view>
</neonViewReference>
</children>
</neonView>
neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
+ 4
− 0
View file @ 1435641d
......@@ -14,6 +14,10 @@
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
<name>03bb4d6e-0371-4175-aaa2-43d43bd4ff60</name>
<entityField>ICON</entityField>
</neonTableColumn>
<neonTableColumn>
<name>4931127b-117d-4b1c-81ba-81ac2162f1b7</name>
<entityField>ENTRYDATE</entityField>
......
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