Skip to content
Snippets Groups Projects
Commit 155dcb2d authored by Gerhard Bachmaier's avatar Gerhard Bachmaier
Browse files

Merge branch '2020.2.0_Betreuung_HamaDSG' into 1066030_gb_2020.2.0_Betreuung_HamaDSG

parents dedaffbc c1e764ba
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 269 additions and 30 deletions
.liquibase/Data_alias/basic/2020.2.0/Districts/alter_districtContact_1066036.xml 0 → 100644
+ 13
− 0
View file @ 155dcb2d
<?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="9aace074-1b61-4577-ad27-bee6a498134c">
<addColumn tableName="DISTRICTCONTACT">
<column name="USER_NEW" type="NVARCHAR(50)" />
<column name="USER_EDIT" type="NVARCHAR(50)" />
<column name="DATE_NEW" type="DATETIME" />
<column name="DATE_EDIT" type="DATETIME" />
</addColumn>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
+ 1
− 0
View file @ 155dcb2d
......@@ -11,4 +11,5 @@
<include relativeToChangelogFile="true" file="insert_KeywordsAdviserRoles.xml"/>
<include relativeToChangelogFile="true" file="update_ContactResponsible_consistent.xml"/>
<include relativeToChangelogFile="true" file="alter_district_1066187.xml"/>
<include relativeToChangelogFile="true" file="alter_districtContact_1066036.xml"/>
</databaseChangeLog>
.liquibase/Data_alias/changelog.xml
+ 1
− 1
View file @ 155dcb2d
......@@ -19,4 +19,4 @@
<!--enable this only when you definetly want to overwrite the existing data with demo records:-->
<!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
</databaseChangeLog>
\ No newline at end of file
</databaseChangeLog>
aliasDefinition/Data_alias/Data_alias.aod
+ 56
− 0
View file @ 155dcb2d
......@@ -15960,6 +15960,62 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</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>USER_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DATE_NEW</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>USER_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
</entities>
......
entity/DistrictContact_entity/DistrictContact_entity.aod
+ 76
− 21
View file @ 155dcb2d
......@@ -11,14 +11,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
<dependencies>
<entityDependency>
<name>12f47cac-d968-4bac-9daa-c254e43bb7b4</name>
<entityName>Organisation_entity</entityName>
<fieldName>DistrictContacts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
......@@ -26,18 +18,27 @@
</entityProvider>
<entityField>
<name>CONTACT_ID</name>
<title>Contact</title>
<title>Company</title>
<consumer>Organisations</consumer>
<groupable v="true" />
<linkedContext>Person</linkedContext>
<displayValueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>DISTRICT_ID</name>
<title>District</title>
<title>{$DISTRICT}</title>
<consumer>Districts</consumer>
<groupable v="true" />
<linkedContext>District</linkedContext>
</entityField>
<entityField>
<name>ADVISER_CONTACT_ID</name>
<title>Adviser contact</title>
<consumer>Advisers</consumer>
<groupable v="true" />
<linkedContext>Person</linkedContext>
<mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/adviser_contact_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>ADVISER_ROLE</name>
......@@ -52,7 +53,6 @@
<consumer>KeywordContactStates</consumer>
<groupable v="true" />
<valueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/status/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>VALID_FROM</name>
......@@ -92,6 +92,10 @@
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>ExcludedKeyIdsSubquery_param</name>
<valueProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/keywordcontactstates/children/excludedkeyidssubquery_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
......@@ -122,39 +126,82 @@
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>Organisations</name>
<dependency>
<name>dependency</name>
<entityName>Organisation_entity</entityName>
<fieldName>Organisations</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>Advisers</name>
<dependency>
<name>dependency</name>
<entityName>DistrictResponsible_entity</entityName>
<fieldName>DistrictResponsibleAdvisers</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>Districts</name>
<dependency>
<name>dependency</name>
<entityName>District_entity</entityName>
<fieldName>DistrictContacts</fieldName>
</dependency>
</entityConsumer>
<entityProvider>
<name>DistrictContacts</name>
<dependencies>
<entityDependency>
<name>6a15b92f-e0b6-459d-a106-615dcfac3dbd</name>
<entityName>District_entity</entityName>
<fieldName>DistrictContactUIDs</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>e33ae6f8-0a21-406c-950a-ab60f27026b3</name>
<entityName>Organisation_entity</entityName>
<fieldName>DistrictContacts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityParameter>
<name>DistrictId_param</name>
<expose v="true" />
</entityParameter>
<entityParameter>
<name>currentOrganisationId_param</name>
<expose v="true" />
</entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/DistrictContact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/DistrictContact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<linkInformation>
<linkInformation>
<name>f753f5d5-67e2-43b0-99ce-58d65a11c69e</name>
<name>dc5cbebc-a947-4196-937a-f665ee80cc31</name>
<tableName>DISTRICTCONTACT</tableName>
<primaryKey>DISTRICTCONTACTID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
<linkInformation>
<name>ca252b67-b32a-407a-9161-88714a4aaeb7</name>
<name>058abbb3-d92f-4fe1-b326-1320cfee90df</name>
<tableName>CONTACT</tableName>
<primaryKey>CONTACTID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
<linkInformation>
<name>2c39c72a-c6f1-4886-adb2-9d00f69ca74a</name>
<tableName>DISTRICT</tableName>
<primaryKey>DISTRICTID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ADVISER_CONTACT_ID.value</name>
<recordfield>DISTRICTCONTACT.CONTACT_ID</recordfield>
<recordfield>DISTRICTCONTACT.ADVISER_CONTACT_ID</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
......@@ -200,6 +247,14 @@
<name>ORIGIN.displayValue</name>
<expression>%aditoprj%/entity/DistrictContact_entity/recordcontainers/db/recordfieldmappings/origin.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DISTRICT_ID.displayValue</name>
<expression>%aditoprj%/entity/DistrictContact_entity/recordcontainers/db/recordfieldmappings/district_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATUS.displayValue</name>
<expression>%aditoprj%/entity/DistrictContact_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/DistrictContact_entity/entityfields/adviser_contact_id/displayValueProcess.js 0 → 100644
+ 5
− 0
View file @ 155dcb2d
import("system.result");
import("system.vars");
import("Contact_lib");
result.string(ContactUtils.getFullTitleByContactId(vars.get("$field.ADVISER_CONTACT_ID"), false));
\ No newline at end of file
entity/DistrictContact_entity/entityfields/contact_id/displayValueProcess.js 0 → 100644
+ 5
− 0
View file @ 155dcb2d
import("system.result");
import("system.vars");
import("Contact_lib");
result.string(ContactUtils.getFullTitleByContactId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
entity/DistrictContact_entity/entityfields/keywordcontactstates/children/excludedkeyidssubquery_param/valueProcess.js 0 → 100644
+ 10
− 0
View file @ 155dcb2d
import("system.result");
import("KeywordRegistry_basic");
import("Sql_lib");
var cond = newSelect("AB_KEYWORD_ENTRY.KEYID")
.from("AB_KEYWORD_ENTRY")
.where("AB_KEYWORD_ENTRY.CONTAINER", $KeywordRegistry.contactStatus())
.and("AB_KEYWORD_ENTRY.KEYID", $KeywordRegistry.contactStatus$inReview(), SqlBuilder.LIKE());
result.string(cond.toString());
\ No newline at end of file
entity/DistrictContact_entity/recordcontainers/db/conditionProcess.js 0 → 100644
+ 14
− 0
View file @ 155dcb2d
import("system.entities");
import("system.result");
import("system.vars");
import("Sql_lib");
var organisationID = vars.get("$param.currentOrganisationId_param");
var cond = newWhere();
if (organisationID)
{
cond.and("DISTRICTCONTACT.CONTACT_ID", organisationID);
}
result.string(cond.toString());
\ No newline at end of file
entity/DistrictContact_entity/recordcontainers/db/fromClauseProcess.js
+ 1
− 2
View file @ 155dcb2d
import("system.result");
var res = "DISTRICTCONTACT \n\
left join CONTACT on (CONTACT.CONTACTID = DISTRICTCONTACT.CONTACT_ID)\n\
left join DISTRICT on (DISTRICT.DISTRICTID = DISTRICTCONTACT.DISTRICT_ID)";
left join CONTACT on (CONTACT.CONTACTID = DISTRICTCONTACT.CONTACT_ID)";
result.string(res);
\ No newline at end of file
entity/DistrictContact_entity/recordcontainers/db/recordfieldmappings/district_id.displayvalue/expression.js 0 → 100644
+ 7
− 0
View file @ 155dcb2d
import("system.result");
import("Sql_lib");
result.string(newSelect("DISTRICT.DISTRICT_NAME")
.from("DISTRICT")
.where("DISTRICT.DISTRICTID = DISTRICTCONTACT.DISTRICT_ID")
.toString());
\ No newline at end of file
entity/DistrictContact_entity/entityfields/status/displayValueProcess.js → entity/DistrictContact_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
+ 6
− 0
View file @ 155dcb2d
import("system.result");
import("system.vars");
import("KeywordRegistry_basic");
import("system.result");
import("Keyword_lib");
var key = vars.get("$field.STATUS");
if (key)
{
var res = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), key);
result.string(res);
}
\ No newline at end of file
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contactStatus(), "DISTRICTCONTACT.STATUS");
result.string(sql);
\ No newline at end of file
entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
+ 16
− 4
View file @ 155dcb2d
......@@ -237,6 +237,18 @@
</entityParameter>
</children>
</entityConsumer>
<entityProvider>
<name>DistrictResponsibleAdvisers</name>
<lookupIdfield>EMPLOYEE_CONTACT_ID</lookupIdfield>
<dependencies>
<entityDependency>
<name>ac067a2d-e313-44b7-b219-f834ef4a7629</name>
<entityName>DistrictContact_entity</entityName>
<fieldName>Advisers</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -307,10 +319,6 @@
<name>PHONE.value</name>
<expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/phone.value/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DISTRICT_ID.displayValue</name>
<expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/district_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>EMPLOYEE_CONTACT_ID.displayValue</name>
<expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js</expression>
......@@ -337,6 +345,10 @@
<recordfield>DISTRICTRESPONSIBLE.VALID_UNTIL</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DISTRICT_ID.displayValue</name>
<expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/district_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/district_id.displayvalue/expression.js
+ 1
− 1
View file @ 155dcb2d
......@@ -4,4 +4,4 @@ import("Sql_lib");
result.string(newSelect("DISTRICT.DISTRICT_NAME")
.from("DISTRICT")
.where("DISTRICT.DISTRICTID = DISTRICTRESPONSIBLE.DISTRICT_ID")
.toString());
.toString());
\ No newline at end of file
entity/District_entity/District_entity.aod
+ 34
− 0
View file @ 155dcb2d
......@@ -231,6 +231,7 @@
<children>
<entityParameter>
<name>DistrictsByContactId_param</name>
<valueProcess>%aditoprj%/entity/District_entity/entityfields/validparentdistricts/children/districtsbycontactid_param/valueProcess.js</valueProcess>
<expose v="false" />
</entityParameter>
</children>
......@@ -276,6 +277,39 @@
</entityActionField>
</children>
</entityActionGroup>
<entityProvider>
<name>DistrictContacts</name>
<dependencies>
<entityDependency>
<name>d94c353f-c66d-489c-934b-72ca154ba37a</name>
<entityName>DistrictContact_entity</entityName>
<fieldName>Districts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>DistrictsByContactId_param</name>
<valueProcess>%aditoprj%/entity/District_entity/entityfields/districtcontacts/children/districtsbycontactid_param/valueProcess.js</valueProcess>
<expose v="true" />
<mandatory v="false" />
</entityParameter>
</children>
</entityProvider>
<entityConsumer>
<name>DistrictContactUIDs</name>
<dependency>
<name>dependency</name>
<entityName>DistrictContact_entity</entityName>
<fieldName>DistrictContacts</fieldName>
</dependency>
<children>
<entityParameter>
<name>DistrictId_param</name>
<valueProcess>%aditoprj%/entity/District_entity/entityfields/districtcontactuids/children/districtid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/District_entity/entityfields/districtcontacts/children/districtsbycontactid_param/valueProcess.js 0 → 100644
+ 3
− 0
View file @ 155dcb2d
import("system.result");
result.string("$$$###ignore_param###$$$");//dummy value, for special treatment in the conditionProcess
\ No newline at end of file
entity/District_entity/entityfields/districtcontactuids/children/districtid_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 155dcb2d
import("system.result");
import("system.vars");
result.string(vars.get("$field.DISTRICTID"));
\ No newline at end of file
entity/District_entity/entityfields/validparentdistricts/children/districtsbycontactid_param/valueProcess.js 0 → 100644
+ 3
− 0
View file @ 155dcb2d
import("system.result");
result.string("$$$###ignore_param###$$$");//dummy value, for special treatment in the conditionProcess
\ No newline at end of file
entity/Organisation_entity/Organisation_entity.aod
+ 13
− 1
View file @ 155dcb2d
......@@ -151,6 +151,12 @@
<fieldName>Organisations</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>b64b29e6-59c5-4250-9bc7-b08c85976e7e</name>
<entityName>DistrictContact_entity</entityName>
<fieldName>Organisations</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
......@@ -1402,8 +1408,14 @@
<dependency>
<name>dependency</name>
<entityName>DistrictContact_entity</entityName>
<fieldName>#PROVIDER</fieldName>
<fieldName>DistrictContacts</fieldName>
</dependency>
<children>
<entityParameter>
<name>currentOrganisationId_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/districtcontacts/children/currentorganisationid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
......
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