Skip to content
Snippets Groups Projects
Commit d8fe2127 authored by dsg03695's avatar dsg03695
Browse files

Ticket #1066024: District Responsible were integrated into the District main... 

Ticket #1066024: District Responsible were integrated into the District main view. In addition the District Responsible data table
were extended (Adviser Role, Adviser Status, Valid From and Valid To) with it all corresponding fields in the entity. 
A simple Edit view were created to select a responsible person with all needed fields and keyword resolvements.
parent 59462d94
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 344 additions and 2 deletions
.liquibase/Data_alias/basic/2020.2.0/Districts/alter_districtResponsibleDatatypes.xml 0 → 100644
+ 13
− 0
View file @ d8fe2127
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="Pierre Suchacek" id="6feb15fd-c517-4bf9-be88-59993908b9ed">
<addColumn tableName="DISTRICTRESPONSIBLE">
<column name="ADVISERSTATUS" type="VARCHAR(36)" />
<column name="ADVISERROLE" type="VARCHAR(36)" />
<column name="VALIDFROM" type="DATETIME" />
<column name="VALIDTO" type="DATETIME" />
</addColumn>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
+ 2
− 0
View file @ d8fe2127
......@@ -5,4 +5,6 @@
<include relativeToChangelogFile="true" file="create_districtresponsible.xml"/>
<include relativeToChangelogFile="true" file="create_districtResponsibleKeyword.xml"/>
<include relativeToChangelogFile="true" file="create_indizes.xml"/>
<include relativeToChangelogFile="true" file="alter_districtResponsibleDatatypes.xml"/>
<include relativeToChangelogFile="true" file="insert_KeywordsAdviserRoles.xml"/>
</databaseChangeLog>
.liquibase/Data_alias/basic/2020.2.0/Districts/insert_KeywordsAdviserRoles.xml 0 → 100644
+ 61
− 0
View file @ d8fe2127
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="Pierre Suchacek" id="d5737f12-5e86-4d6c-bcc7-7d7bed2d993f">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="97c73c26-c90e-410b-8732-47cbeaf986df"/>
<column name="KEYID" value="ADVISERROLE_SalesManager"/>
<column name="TITLE" value="Sales Manager"/>
<column name="CONTAINER" value="ADVISER_ROLE"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="8d853c34-0896-45db-989d-131a15bd0c6a"/>
<column name="KEYID" value="ADVISERROLE_OfficeDuty"/>
<column name="TITLE" value="Office Duty"/>
<column name="CONTAINER" value="ADVISER_ROLE"/>
<column name="SORTING" valueNumeric="1"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="40212bc7-df71-4131-965b-344e6baf7c57"/>
<column name="KEYID" value="ADVISERROLE_RegionManager"/>
<column name="TITLE" value="Region Manager"/>
<column name="CONTAINER" value="ADVISER_ROLE"/>
<column name="SORTING" valueNumeric="2"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="df052065-a32d-4c17-a229-60abcaf2736f"/>
<column name="KEYID" value="ADVISERROLE_AccountManager"/>
<column name="TITLE" value="Account Manager"/>
<column name="CONTAINER" value="ADVISER_ROLE"/>
<column name="SORTING" valueNumeric="3"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="3b080d0e-9301-47f2-9ead-10f2b5aaf701"/>
<column name="KEYID" value="ADVISERROLE_AreaManager"/>
<column name="TITLE" value="Area Manager"/>
<column name="CONTAINER" value="ADVISER_ROLE"/>
<column name="SORTING" valueNumeric="4"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="a343cbe0-af9c-464c-861e-65f00eab392f"/>
<column name="KEYID" value="ADVISERROLE_FieldService"/>
<column name="TITLE" value="Field Service"/>
<column name="CONTAINER" value="ADVISER_ROLE"/>
<column name="SORTING" valueNumeric="5"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2020.2.0/changelog.xml
+ 1
− 1
View file @ d8fe2127
......@@ -6,7 +6,7 @@
<include relativeToChangelogFile="true" file="ImportFields/changelog.xml"/>
<include relativeToChangelogFile="true" file="LeadimportMappingAssistant/changelog.xml"/>
<include relativeToChangelogFile="true" file="Lead/changelog.xml"/>
<include relativeToChangelogFile="true" file="optimizeIndizes.xml"/>
<!--<include relativeToChangelogFile="true" file="optimizeIndizes.xml"/>-->
<include relativeToChangelogFile="true" file="addNotificationStateKeywords/addNotificationStateKeyword.xml"/>
<include relativeToChangelogFile="true" file="alter_ComunicationMedium_IdDatatype.xml"/>
<include relativeToChangelogFile="true" file="ReportDispatchImpl/add_DocumentTemplatePlaceOfUse.xml"/>
......
aliasDefinition/Data_alias/Data_alias.aod
+ 56
− 0
View file @ d8fe2127
......@@ -15708,6 +15708,62 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>VALIDFROM</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="19" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>VALIDTO</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="19" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>ADVISERROLE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>ADVISERSTATUS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
</entities>
......
entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
+ 79
− 1
View file @ d8fe2127
......@@ -8,6 +8,7 @@
<contentTitleProcess>%aditoprj%/entity/DistrictResponsible_entity/contentTitleProcess.js</contentTitleProcess>
<iconIdProcess>%aditoprj%/entity/DistrictResponsible_entity/iconIdProcess.js</iconIdProcess>
<image>VAADIN:GLOBE</image>
<usePermissions v="false" />
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
......@@ -23,8 +24,9 @@
<entityField>
<name>EMPLOYEE_CONTACT_ID</name>
<title>{$DISTRICT_RESPONSIBLE}</title>
<consumer>Employees</consumer>
<consumer>Persons</consumer>
<linkedContext>Person</linkedContext>
<mandatory v="true" />
<selectionMode>SINGLE</selectionMode>
<displayValueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/employee_contact_id/displayValueProcess.js</displayValueProcess>
</entityField>
......@@ -204,6 +206,61 @@
<name>targetContext</name>
<valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/targetcontext/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
<name>Persons</name>
<dependency>
<name>dependency</name>
<entityName>Person_entity</entityName>
<fieldName>Contacts</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>ADVISERROLE</name>
<title>Adviser role</title>
<consumer>AdviserRoles</consumer>
</entityField>
<entityField>
<name>ADVISERSTATUS</name>
<title>Adviser status</title>
<consumer>AdviserStates</consumer>
<groupable v="true" />
<valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/adviserstatus/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
<name>AdviserStates</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/adviserstates/children/containername_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>VALIDFROM</name>
</entityField>
<entityField>
<name>VALIDTO</name>
</entityField>
<entityConsumer>
<name>AdviserRoles</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/adviserroles/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -291,6 +348,27 @@
<name>EMPLOYEE_CONTACT_ID.displayValue</name>
<expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ADVISERSTATUS.displayValue</name>
<expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/adviserstatus.displayvalue/expression.js</expression>
<columnAlias></columnAlias>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ADVISERROLE.value</name>
<recordfield>DISTRICTRESPONSIBLE.ADVISERROLE</recordfield>
<isFilterable v="true" />
<isLookupFilter v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ADVISERSTATUS.value</name>
<recordfield>DISTRICTRESPONSIBLE.ADVISERSTATUS</recordfield>
<isFilterable v="true" />
<isLookupFilter v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ADVISERROLE.displayValue</name>
<expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/adviserrole.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/DistrictResponsible_entity/entityfields/adviserroles/children/containername_param/valueProcess.js 0 → 100644
+ 5
− 0
View file @ d8fe2127
import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
result.string($KeywordRegistry.adviserRole());
\ No newline at end of file
entity/DistrictResponsible_entity/entityfields/adviserstates/children/containername_param/valueProcess.js 0 → 100644
+ 5
− 0
View file @ d8fe2127
import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
result.string($KeywordRegistry.contactStatus());
\ No newline at end of file
entity/DistrictResponsible_entity/entityfields/adviserstatus/valueProcess.js 0 → 100644
+ 7
− 0
View file @ d8fe2127
import("system.vars");
import("system.result");
import("system.neon");
import("KeywordRegistry_basic");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
result.string($KeywordRegistry.contactStatus$active());
\ No newline at end of file
entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/adviser_status.displayvalue/expression.js 0 → 100644
+ 6
− 0
View file @ d8fe2127
import("system.result");
import("system.vars");
import("Keyword_lib");
import("KeywordRegistry_basic");
result.string(KeywordUtils.getViewValue($KeywordRegistry.contractStatus(), vars.get("$field.ADVISERSTATUS")));
\ No newline at end of file
entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/adviserrole.displayvalue/expression.js 0 → 100644
+ 5
− 0
View file @ d8fe2127
import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
result.string($KeywordRegistry.adviserRole());
\ No newline at end of file
entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/adviserstatus.displayvalue/expression.js 0 → 100644
+ 5
− 0
View file @ d8fe2127
import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
result.string($KeywordRegistry.contractStatus());
\ No newline at end of file
entity/KeywordEntry_entity/KeywordEntry_entity.aod
+ 12
− 0
View file @ d8fe2127
......@@ -589,6 +589,18 @@
<fieldName>KeywordVisitRecommendationSource</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>6f8ca40b-52bc-461f-8b97-083e1509c6fb</name>
<entityName>DistrictResponsible_entity</entityName>
<fieldName>AdviserStates</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>146306af-cb4e-4d60-8298-f298770e7efb</name>
<entityName>DistrictResponsible_entity</entityName>
<fieldName>AdviserRoles</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
......
entity/Person_entity/Person_entity.aod
+ 6
− 0
View file @ d8fe2127
......@@ -719,6 +719,12 @@
<fieldName>Persons</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>6854e035-f459-41b2-84f8-9f5cca5dbe80</name>
<entityName>DistrictResponsible_entity</entityName>
<fieldName>Persons</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
......
neonContext/DistrictResponsible/DistrictResponsible.aod
+ 9
− 0
View file @ d8fe2127
......@@ -3,6 +3,7 @@
<name>DistrictResponsible</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:GLOBE</icon>
<editView>DistrictResponsibleEdit_view</editView>
<entity>DistrictResponsible_entity</entity>
<references>
<neonViewReference>
......@@ -17,5 +18,13 @@
<name>cba355d3-4ef4-441e-8976-f51c8fe65eec</name>
<view>DistrictResponsiblePreviewList_view</view>
</neonViewReference>
<neonViewReference>
<name>4fb58e00-a771-4a2b-a820-d0f863572d89</name>
<view>DistrictResponsibleFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>bf0655aa-60e7-47b8-a3e7-eb7ba8b37cac</name>
<view>DistrictResponsibleEdit_view</view>
</neonViewReference>
</references>
</neonContext>
neonView/DistrictMain_view/DistrictMain_view.aod
+ 5
− 0
View file @ d8fe2127
......@@ -14,6 +14,11 @@
<entityField>#ENTITY</entityField>
<view>DistrictPreview_view</view>
</neonViewReference>
<neonViewReference>
<name>a260fdae-7820-4997-8548-774a589a8e19</name>
<entityField>DistrictResponsibles</entityField>
<view>DistrictResponsibleFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>b409f300-c8b4-4052-9012-5e6b79c03a9c</name>
<entityField>Organisations</entityField>
......
neonView/DistrictResponsibleEdit_view/DistrictResponsibleEdit_view.aod 0 → 100644
+ 35
− 0
View file @ d8fe2127
<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
<name>DistrictResponsibleEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<noneLayout>
<name>layout</name>
</noneLayout>
</layout>
<children>
<genericViewTemplate>
<name>genericViewTemplate</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>c33c329b-99ef-4172-b2c1-7fbe0a69ea1d</name>
<entityField>DISTRICT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>9e7007c1-7b6e-45d9-961f-7877c2766688</name>
<entityField>EMPLOYEE_CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>713d2f8f-eeb4-4b45-a1cd-968db6b17064</name>
<entityField>ADVISERROLE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>94396f7a-4876-466e-85f0-2701814ea4d1</name>
<entityField>ADVISERSTATUS</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
</neonView>
neonView/DistrictResponsibleFilter_view/DistrictResponsibleFilter_view.aod 0 → 100644
+ 30
− 0
View file @ d8fe2127
<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
<name>DistrictResponsibleFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<groupLayout>
<name>layout</name>
</groupLayout>
</layout>
<children>
<tableViewTemplate>
<name>Supervisors</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
<name>62564dc9-6f03-4cfe-b340-7588bae53ba5</name>
<entityField>#ICON</entityField>
</neonTableColumn>
<neonTableColumn>
<name>57a8ac3c-4dfc-44ed-b786-e347855dc134</name>
<entityField>EMPLOYEE_CONTACT_ID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>3f957c20-9019-47dc-8761-6ea46c68984d</name>
<entityField>departmentAttributeName</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
</children>
</neonView>
process/KeywordRegistry_basic/process.js
+ 2
− 0
View file @ d8fe2127
......@@ -296,3 +296,5 @@ $KeywordRegistry.workflowCategory = function(){return "WorkflowCategory";};
$KeywordRegistry.notificationState = function(){ return "NotificationState";};
$KeywordRegistry.notificationState$unseen = function(){return "UNSEEN";};
$KeywordRegistry.notificationState$seen = function(){return "SEEN";};
$KeywordRegistry.adviserRole = function(){ return "ADVISER_ROLE";};
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