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

drop relationship

parent 2f38ba23
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 205 additions and 273 deletions
.liquibase/Data_alias/basic/2020.0.0/changelog.xml 0 → 100644
+ 7
− 0
View file @ 373e8f76
<?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">
<include relativeToChangelogFile="true" file="drop_relationship.xml"/>
</databaseChangeLog>
.liquibase/Data_alias/basic/2020.0.0/drop_relationship.xml 0 → 100644
+ 8
− 0
View file @ 373e8f76
<?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="j.hoermann" id="fa512b82-fbe3-41c5-bd44-600fec5df6bc">
<dropColumn tableName="CONTACT" columnName="RELATIONSHIP"/>
<dropColumn tableName="OBJECTMEMBER" columnName="RELATIONSHIP"/>
</changeSet>
</databaseChangeLog>
.liquibase/Data_alias/changelog.xml
+ 1
− 0
View file @ 373e8f76
......@@ -5,6 +5,7 @@
<include relativeToChangelogFile="true" file="basic/2019.2.1/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2019.3.0/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2019.3.1/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2020.0.0/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
</databaseChangeLog>
\ No newline at end of file
aliasDefinition/Data_alias/Data_alias.aod
+ 189
− 203
View file @ 373e8f76
This diff is collapsed.
entity/AnyContact_entity/AnyContact_entity.aod
+ 0
− 8
View file @ 373e8f76
......@@ -123,10 +123,6 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<name>STANDARD_PHONE_COMMUNICATION</name>
<title>Phone</title>
</entityField>
<entityField>
<name>RELATIONSHIP</name>
<description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
</entityField>
<entityField>
<name>PERSON_MIDDLENAME</name>
</entityField>
......@@ -252,10 +248,6 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<name>STANDARD_PHONE_COMMUNICATION.value</name>
<expression>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.value/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>RELATIONSHIP.value</name>
<recordfield>CONTACT.RELATIONSHIP</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PERSON_MIDDLENAME.value</name>
<recordfield>PERSON.MIDDLENAME</recordfield>
......
entity/Member_entity/Member_entity.aod
+ 0
− 30
View file @ 373e8f76
......@@ -75,26 +75,6 @@
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Member_entity/entityfields/person_full_name/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>RELATIONSHIP</name>
<title>Relationship</title>
<description>Overrules CONTACT_RELATIONSHIP
TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... aktuell im edit mode auf leeres Feld, dann wird das aus contact angezeigt</description>
<contentType>NUMBER</contentType>
<displayValueProcess>%aditoprj%/entity/Member_entity/entityfields/relationship/displayValueProcess.js</displayValueProcess>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
<element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
<entityField>
<name>CONTACT_RELATIONSHIP</name>
<title>Relationship</title>
<description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
<contentType>NUMBER</contentType>
</entityField>
<entityConsumer>
<name>Contacts</name>
<dependency>
......@@ -293,16 +273,6 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
<recordfield>OBJECTMEMBER.CONTACT_ID</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>RELATIONSHIP.value</name>
<recordfield>OBJECTMEMBER.RELATIONSHIP</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_RELATIONSHIP.value</name>
<recordfield>CONTACT.RELATIONSHIP</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.displayValue</name>
<expression>%aditoprj%/entity/Member_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js</expression>
......
entity/Member_entity/entityfields/relationship/displayValueProcess.js deleted 100644 → 0
+ 0
− 13
View file @ 2f38ba23
import("system.result");
import("system.vars");
var localRelationship = vars.get("$field.RELATIONSHIP");
if (localRelationship)
{
result.string(localRelationship);
}
else
{
result.string(vars.get("$field.CONTACT_RELATIONSHIP"));
}
entity/Person_entity/Person_entity.aod
+ 0
− 13
View file @ 373e8f76
......@@ -365,14 +365,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>REL_RELATIONSHIP</name>
<title>Relationship</title>
<description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
<contentType>NUMBER</contentType>
<mandatory v="false" />
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/rel_relationship/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>STANDARD_EMAIL_COMMUNICATION</name>
<title>E-Mail</title>
......@@ -1223,11 +1215,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<recordfield>CONTACT.ORGANISATION_ID</recordfield>
<isFilterable v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>REL_RELATIONSHIP.value</name>
<recordfield>CONTACT.RELATIONSHIP</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDARD_EMAIL_COMMUNICATION.displayValue</name>
<expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.displayvalue/expression.js</expression>
......
entity/Person_entity/entityfields/rel_relationship/valueProcess.js deleted 100644 → 0
+ 0
− 6
View file @ 2f38ba23
import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.object(2);
\ No newline at end of file
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