Skip to content
Snippets Groups Projects
Commit 9a21f8bf authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

[Projekt: Entwicklung - Neon][TicketNr.: 1035771][Kontaktmanagement - Firma /... 

[Projekt: Entwicklung - Neon][TicketNr.: 1035771][Kontaktmanagement - Firma / Kontaktperson + Adressen / Kommunikation - Nutzung des kompletten Moduls sicherstellen]
parent f62cdcdc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 64 additions and 37 deletions
entity/AnyContact_entity/AnyContact_entity.aod
+ 24
− 4
View file @ 9a21f8bf
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
<name>AnyContact_entity</name>
<description>former Relation</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
<titleProcess>%aditoprj%/entity/AnyContact_entity/titleProcess.js</titleProcess>
<recordContainer>db</recordContainer>
......@@ -56,7 +55,7 @@
<entityField>
<name>contactType</name>
<description>Relation type. Value is based on the existance or non-existance of ORGANISATION_ID and PERSON_ID.
See RelationUtils.getRelationTypeByPersOrg for possible values</description>
See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<contentType>NUMBER</contentType>
<searchable v="false" />
<valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/contactType/valueProcess.js</valueProcess>
......@@ -92,7 +91,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
</children>
</entityConsumer>
<entityField>
<name>ORG_NAME</name>
<name>ORGANISATION_NAME</name>
<title>Organisation name</title>
</entityField>
<entityField>
......@@ -152,6 +151,15 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<name>RELATIONSHIP</name>
<description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
</entityField>
<entityField>
<name>PERSON_MIDDLENAME</name>
</entityField>
<entityField>
<name>PERSON_TITLE</name>
</entityField>
<entityField>
<name>PERSON_SALUTATION</name>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -214,7 +222,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<recordfield>CONTACT.STATUS</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_NAME.value</name>
<name>ORGANISATION_NAME.value</name>
<recordfield>ORGANISATION.NAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
......@@ -237,6 +245,18 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<name>RELATIONSHIP.value</name>
<recordfield>CONTACT.RELATIONSHIP</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PERSON_MIDDLENAME.value</name>
<recordfield>PERSON.MIDDLENAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PERSON_TITLE.value</name>
<recordfield>PERSON.TITLE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PERSON_SALUTATION.value</name>
<recordfield>PERSON.SALUTATION</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/AnyContact_entity/entityfields/contacttype/valueProcess.js
+ 1
− 1
View file @ 9a21f8bf
......@@ -2,4 +2,4 @@ import("system.result");
import("system.vars");
import("Contact_lib")
result.object(RelationUtils.getRelationType(vars.get("$field.CONTACTID"), vars.get("$field.PERSON_ID"), vars.get("$field.ORGANISATION_ID")));
\ No newline at end of file
result.object(ContactUtils.getRelationType(vars.get("$field.CONTACTID"), vars.get("$field.PERSON_ID"), vars.get("$field.ORGANISATION_ID")));
\ No newline at end of file
entity/AnyContact_entity/entityfields/image/valueProcess.js
+ 1
− 1
View file @ 9a21f8bf
......@@ -7,7 +7,7 @@ import("Contact_lib");
if (vars.get("$field.contactType") == 1) // 1 == org, 2 == person, 3 == person
{
result.string(OrgUtils.getImage(vars.get("$field.ORGANISATION_ID"), vars.getString("$field.ORG_NAME")));
result.string(OrgUtils.getImage(vars.get("$field.ORGANISATION_ID"), vars.getString("$field.ORGANISATION_NAME")));
}
else
{
......
entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js
+ 1
− 1
View file @ 9a21f8bf
import("system.result");
import("Contact_lib")
result.string(RelationUtils.getFullRelationFromString());
\ No newline at end of file
result.string(ContactUtils.getFullRelationString());
\ No newline at end of file
entity/AnyContact_entity/titleProcess.js
+ 12
− 5
View file @ 9a21f8bf
import("system.vars");
import("system.result");
import("Util_lib");
import("Contact_lib");
if(vars.get("$field.PERSON_FIRSTNAME")) {
result.string(vars.get("$field.PERSON_FIRSTNAME") + " " + vars.get("$field.PERSON_LASTNAME"));
} else {
result.string(vars.get("$field.ORG_NAME"));
}
var contact = new Contact();
contact.organisationName = vars.get("$field.ORGANISATION_NAME");
contact.salutation = vars.get("$field.PERSON_SALUTATION");
contact.title = vars.get("$field.PERSON_TITLE");
contact.firstname = vars.get("$field.PERSON_FIRSTNAME");
contact.middlename = vars.get("$field.PERSON_MIDDLENAME");
contact.lastname = vars.get("$field.PERSON_LASTNAME");
var renderer = new ContactTitleRenderer(contact);
result.string(renderer.asString());
\ No newline at end of file
entity/Contract_entity/Contract_entity.aod
+ 0
− 4
View file @ 9a21f8bf
......@@ -380,10 +380,6 @@
<name>CONTACT_PERSON_ID.value</name>
<recordfield>CONTACT.PERSON_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_NAME.value</name>
<recordfield>ORGANISATION.NAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PERSON_FIRSTNAME.value</name>
<recordfield>PERSON.FIRSTNAME</recordfield>
......
entity/Contract_entity/entityfields/contact_id/displayValueProcess.js
+ 1
− 1
View file @ 9a21f8bf
......@@ -3,4 +3,4 @@ import("system.vars");
import("Contact_lib");
import("system.neon");
result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
result.string(ContactUtils.getFullTitleByContactId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js
+ 1
− 1
View file @ 9a21f8bf
......@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
import("Contact_lib");
result.string(RelationUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
result.string(ContactUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
entity/Offer_entity/entityfields/contact_id/displayValueProcess.js
+ 1
− 1
View file @ 9a21f8bf
......@@ -4,4 +4,4 @@ import("Contact_lib");
import("system.neon");
result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
result.string(ContactUtils.getFullTitleByContactId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js
+ 1
− 1
View file @ 9a21f8bf
......@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
import("Contact_lib");
result.string(RelationUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
result.string(ContactUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js
+ 1
− 1
View file @ 9a21f8bf
......@@ -2,7 +2,7 @@ import("system.vars");
import("system.result");
import("Contact_lib");
var type = RelationUtils.getRelationType(vars.get("$field.CONTACT_ID"), vars.get("$field.CONTACT_PERSON_ID"), vars.get("$field.CONTACT_ORG_ID"));
var type = ContactUtils.getRelationType(vars.get("$field.CONTACT_ID"), vars.get("$field.CONTACT_PERSON_ID"), vars.get("$field.CONTACT_ORG_ID"));
result.string(type != 2);
......
entity/Order_entity/entityfields/contact_id/displayValueProcess.js
+ 1
− 1
View file @ 9a21f8bf
......@@ -3,4 +3,4 @@ import("system.vars");
import("Contact_lib");
import("system.neon");
result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
result.string(ContactUtils.getFullTitleByContactId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
entity/Order_entity/entityfields/contact_id/linkedContextProcess.js
+ 1
− 1
View file @ 9a21f8bf
......@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
import("Contact_lib");
result.string(RelationUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
result.string(ContactUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
entity/Person_entity/Person_entity.aod
+ 0
− 1
View file @ 9a21f8bf
......@@ -326,7 +326,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<element>FIRSTNAME</element>
<element>MIDDLENAME</element>
<element>LASTNAME</element>
<element>TITLESUFFIX</element>
</fields>
</entityFieldGroup>
<entityProvider>
......
entity/Person_entity/entityfields/full_name_fieldgroup/valueProcess.js
+ 11
− 6
View file @ 9a21f8bf
import("system.vars");
import("system.result");
import("Util_lib");
import("Contact_lib");
result.string((vars.get("$field.SALUTATION") ? vars.get("$field.SALUTATION") + " " : "")
+ (vars.get("$field.TITLE") ? vars.get("$field.TITLE") + " " : "")
+ (vars.get("$field.FIRSTNAME") ? vars.get("$field.FIRSTNAME") + " " : "")
+ (vars.get("$field.MIDDLENAME") ? vars.get("$field.MIDDLENAME") + " " : "")
+ (vars.get("$field.LASTNAME") ? vars.get("$field.LASTNAME") + " " : "")
+ vars.get("$field.TITLESUFFIX"))
\ No newline at end of file
var contact = new Contact();
contact.salutation = vars.get("$field.SALUTATION");
contact.title = vars.get("$field.TITLE");
contact.firstname = vars.get("$field.FIRSTNAME");
contact.middlename = vars.get("$field.MIDDLENAME");
contact.lastname = vars.get("$field.LASTNAME");
var renderer = new ContactTitleRenderer(contact, null);
result.string(renderer.asString());
\ No newline at end of file
entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+ 2
− 2
View file @ 9a21f8bf
......@@ -72,7 +72,7 @@
<linkedContext>Organisation</linkedContext>
</entityField>
<entityField>
<name>ORG_NAME</name>
<name>ORGANISATION_NAME</name>
<state>READONLY</state>
<onValueChangeTypes>
<element>MASK</element>
......@@ -262,7 +262,7 @@
<recordfield>SALESPROJECT_COMPETITION.INFO</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_NAME.value</name>
<name>ORGANISATION_NAME.value</name>
<recordfield>ORGANISATION.NAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
......
entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+ 2
− 2
View file @ 9a21f8bf
......@@ -56,7 +56,7 @@
<description>PARAMETER</description>
</entityParameter>
<entityField>
<name>ORG_NAME</name>
<name>ORGANISATION_NAME</name>
<title>Company</title>
<state>READONLY</state>
</entityField>
......@@ -211,7 +211,7 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ORG_NAME.value</name>
<name>ORGANISATION_NAME.value</name>
<recordfield>ORGANISATION.NAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
......
neonView/AnyContactLookup_view/AnyContactLookup_view.aod
+ 1
− 1
View file @ 9a21f8bf
......@@ -18,7 +18,7 @@
</neonTableColumn>
<neonTableColumn>
<name>ca59a64a-adce-49c3-93ad-2978c81809f8</name>
<entityField>ORG_NAME</entityField>
<entityField>ORGANISATION_NAME</entityField>
</neonTableColumn>
<neonTableColumn>
<name>814b3f18-106a-443e-8415-762669f862e6</name>
......
neonView/PersonPreview_view/PersonPreview_view.aod
+ 1
− 1
View file @ 9a21f8bf
......@@ -11,7 +11,7 @@
<cardViewTemplate>
<name>PersHeader_template</name>
<iconField>IMAGE</iconField>
<titleField>NAME_fieldGroup</titleField>
<titleField>FULL_NAME_fieldGroup</titleField>
<descriptionField>ORGANISATION_ID</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
......
neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
+ 1
− 1
View file @ 9a21f8bf
......@@ -15,7 +15,7 @@
<columns>
<neonTableColumn>
<name>27e658bc-c134-4fef-a3a5-b172852d606e</name>
<entityField>ORG_NAME</entityField>
<entityField>ORGANISATION_NAME</entityField>
</neonTableColumn>
<neonTableColumn>
<name>59e6aea1-9752-48b5-9d91-43edd0c1d670</name>
......
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