Skip to content
Snippets Groups Projects
Commit 3e402491 authored by S.Listl's avatar S.Listl
Browse files

Employee department, indexsearch

parent c33082e1
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 6781 additions and 6800 deletions
.liquibase/Data_alias/basic/2019.2/AttributeKeyword.xml
+ 22
− 22
View file @ 3e402491
<?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.listl" id="f527a5cc-f1e5-497f-a069-33aee944d421">
<addColumn tableName="AB_ATTRIBUTE">
<column name="KEYWORD_CONTAINER" type="VARCHAR(80)"/>
<column name="ATTRIBUTE_INFO" type="NCLOB"/>
<column name="SORTING" type="INTEGER"/>
</addColumn>
<addColumn tableName="AB_ATTRIBUTERELATION">
<column name="INT_VALUE" type="INTEGER"/>
</addColumn>
<dropColumn tableName="AB_ATTRIBUTERELATION">
<column name="BOOL_VALUE"/>
</dropColumn>
<dropColumn tableName="AB_ATTRIBUTE">
<column name="ATTRIBUTE_LEVEL"/>
</dropColumn>
<modifyDataType tableName="AB_ATTRIBUTERELATION" columnName="CHAR_VALUE" newDataType="NVARCHAR(512)"/>
<createIndex indexName="IDX_ATTRPARENT" tableName="AB_ATTRIBUTE">
<column name="ATTRIBUTE_PARENT_ID"/>
</createIndex>
</changeSet>
<?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.listl" id="f527a5cc-f1e5-497f-a069-33aee944d421">
<addColumn tableName="AB_ATTRIBUTE">
<column name="KEYWORD_CONTAINER" type="VARCHAR(80)"/>
<column name="ATTRIBUTE_INFO" type="NCLOB"/>
<column name="SORTING" type="INTEGER"/>
</addColumn>
<addColumn tableName="AB_ATTRIBUTERELATION">
<column name="INT_VALUE" type="INTEGER"/>
</addColumn>
<dropColumn tableName="AB_ATTRIBUTERELATION">
<column name="BOOL_VALUE"/>
</dropColumn>
<dropColumn tableName="AB_ATTRIBUTE">
<column name="ATTRIBUTE_LEVEL"/>
</dropColumn>
<modifyDataType tableName="AB_ATTRIBUTERELATION" columnName="CHAR_VALUE" newDataType="NVARCHAR(512)"/>
<createIndex indexName="IDX_ATTRPARENT" tableName="AB_ATTRIBUTE">
<column name="ATTRIBUTE_PARENT_ID"/>
</createIndex>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
+ 0
− 53
View file @ 3e402491
<?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.listl" id="33bfbf9d-e3b9-4dd0-94e5-f22c74bc3014">
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="c401df51-da3f-4a99-a645-777dc717f6a8"/>
<column name="AB_ATTRIBUTE_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
<column name="OBJECT_TYPE" value="Employee"/>
</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="356de618-4e0d-48e7-a2bc-942bd479cdb8"/>
<column name="AB_ATTRIBUTE_ID" value="29e6ddbf-77fd-4fb2-ae20-fdad9495dbd5"/>
<column name="OBJECT_TYPE" value="Employee"/>
</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="4a352aad-f691-4f2c-b9bf-d7e6bdb93ffa"/>
<column name="AB_ATTRIBUTE_ID" value="c9d81109-4406-4205-8b90-e27acf587cf1"/>
<column name="OBJECT_TYPE" value="Employee"/>
</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="0f184647-c20d-411d-91e7-b390824a4e43"/>
<column name="AB_ATTRIBUTE_ID" value="dc1427a9-056a-463a-a07f-f08f820fae0e"/>
<column name="OBJECT_TYPE" value="Employee"/>
</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="28c7b827-a54a-4848-af8e-c42130d9080e"/>
<column name="AB_ATTRIBUTE_ID" value="5999ee67-44a4-4ec6-a4c4-6c6d58b8e50a"/>
<column name="OBJECT_TYPE" value="Employee"/>
</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="a67b3d1a-caca-42da-8fe9-842ad681041c"/>
<column name="AB_ATTRIBUTE_ID" value="93de7e9f-3ecd-45e7-aafe-020ab5f3ee79"/>
<column name="OBJECT_TYPE" value="Employee"/>
</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="a2fd0be6-71e7-467f-9e9d-e68154dbccaf"/>
<column name="AB_ATTRIBUTE_ID" value="e47c7fb1-1072-4f03-a275-e4b6331deec1"/>
<column name="OBJECT_TYPE" value="Employee"/>
</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="d3d463dc-64c3-4e6a-a6a2-28d03ca08f34"/>
<column name="AB_ATTRIBUTE_ID" value="c133a157-0109-4d88-8343-71db25b12fc5"/>
<column name="OBJECT_TYPE" value="Employee"/>
</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="3234f4e2-0ee7-4782-9b10-c953b7b1be29"/>
<column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
......@@ -809,19 +769,6 @@
<param value="04278ec-6e1b-42d7-bbcc-00fd4a1b1db7"/>
</whereParams>
</delete>
<delete tableName="AB_ATTRIBUTEUSAGE">
<where>AB_ATTRIBUTEUSAGEID in (?, ?, ?, ?, ?, ?, ?, ?)</where>
<whereParams>
<param value="c401df51-da3f-4a99-a645-777dc717f6a8"/>
<param value="356de618-4e0d-48e7-a2bc-942bd479cdb8"/>
<param value="4a352aad-f691-4f2c-b9bf-d7e6bdb93ffa"/>
<param value="0f184647-c20d-411d-91e7-b390824a4e43"/>
<param value="28c7b827-a54a-4848-af8e-c42130d9080e"/>
<param value="a67b3d1a-caca-42da-8fe9-842ad681041c"/>
<param value="a2fd0be6-71e7-467f-9e9d-e68154dbccaf"/>
<param value="d3d463dc-64c3-4e6a-a6a2-28d03ca08f34"/>
</whereParams>
</delete>
</rollback>
</changeSet>
</databaseChangeLog>
aliasDefinition/Data_alias/Data_alias.aod
+ 6090
− 6090
View file @ 3e402491
This diff is collapsed.
aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
+ 2
− 2
View file @ 3e402491
......@@ -19,8 +19,8 @@ sqlQuery = "select CONTACT.CONTACTID "
+ "," + sqlHelper.concat([
sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'"
,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
,sqlHelper.concat(["'" + translate.text("Phone") + ":'", CommUtil.getStandardSubSqlPhone("CONTACTID")])
,sqlHelper.concat(["'" + translate.text("Email") + ":'", CommUtil.getStandardSubSqlMail("CONTACTID")])
,sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"])
,sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
], " | ") + " as DESCCOLUMN "
//additional indexed fields
+ ",ORGANISATION.NAME, COMMUNICATION.ADDR "
......
aliasDefinition/Data_alias/indexsearchgroups/person/query.js
+ 2
− 2
View file @ 3e402491
......@@ -19,8 +19,8 @@ sqlQuery = "select CONTACT.CONTACTID "
+ "," + sqlHelper.concat([
sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'"
,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
,sqlHelper.concat(["'" + translate.text("Phone") + ":'", CommUtil.getStandardSubSqlPhone("CONTACTID")])
,sqlHelper.concat(["'" + translate.text("Email") + ":'", CommUtil.getStandardSubSqlMail("CONTACTID")])
,sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"])
,sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
], " | ") + " as DESCCOLUMN "
//additional indexed fields
+ ",ORGANISATION.NAME, COMMUNICATION.ADDR "
......
entity/AttributeRelationTree_entity/entityfields/value/contentTypeProcess.js
+ 5
− 5
View file @ 3e402491
import("system.vars");
import("system.result");
import("Attribute_lib");
var attributeType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
import("system.vars");
import("system.result");
import("Attribute_lib");
var attributeType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
result.string(AttributeTypeUtil.getContentType(attributeType));
\ No newline at end of file
entity/AttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js
+ 5
− 5
View file @ 3e402491
import("system.vars");
import("system.result");
import("Attribute_lib");
var attributeType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
import("system.vars");
import("system.result");
import("Attribute_lib");
var attributeType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
result.string(AttributeTypeUtil.getContentType(attributeType));
\ No newline at end of file
entity/AttributeRelation_entity/entityfields/valueproxy/displayValueProcess.js
+ 26
− 26
View file @ 3e402491
import("system.db");
import("system.result");
import("system.vars");
import("Attribute_lib");
import("Keyword_lib");
var attrType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
var value;
if (attrType == $AttributeTypes.COMBO)
value = AttributeUtil.getSimpleAttributeName(vars.get("$field.ID_VALUE"));
//TODO this is a workaround for keywords, when it's possible to use the consumer remove this else if
else if (attrType == $AttributeTypes.KEYWORD)
{
var keywordContainer = db.cell(
SqlCondition.begin()
.andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.AB_ATTRIBUTE_ID")
.buildSql("select KEYWORD_CONTAINER from AB_ATTRIBUTE")
);
value = KeywordUtils.getViewValue(keywordContainer, vars.get("$field.ID_VALUE"));
}
else
value = vars.get("$field.valueProxy");
result.string(value);
import("system.db");
import("system.result");
import("system.vars");
import("Attribute_lib");
import("Keyword_lib");
var attrType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
var value;
if (attrType == $AttributeTypes.COMBO)
value = AttributeUtil.getSimpleAttributeName(vars.get("$field.ID_VALUE"));
//TODO this is a workaround for keywords, when it's possible to use the consumer remove this else if
else if (attrType == $AttributeTypes.KEYWORD)
{
var keywordContainer = db.cell(
SqlCondition.begin()
.andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.AB_ATTRIBUTE_ID")
.buildSql("select KEYWORD_CONTAINER from AB_ATTRIBUTE")
);
value = KeywordUtils.getViewValue(keywordContainer, vars.get("$field.ID_VALUE"));
}
else
value = vars.get("$field.valueProxy");
result.string(value);
entity/Attribute_entity/Attribute_entity.aod
+ 318
− 312
View file @ 3e402491
This diff is collapsed.
entity/Employee_entity/Employee_entity.aod
+ 294
− 273
View file @ 3e402491
This diff is collapsed.
entity/Employee_entity/entityfields/department/displayValueProcess.js 0 → 100644
+ 5
− 0
View file @ 3e402491
import("system.result");
import("system.vars");
import("Attribute_lib");
result.string(AttributeUtil.getFullAttributeName(vars.get("$field.DEPARTMENT")));
\ No newline at end of file
entity/Employee_entity/entityfields/departments/children/attrparentid_param/valueProcess.js 0 → 100644
+ 2
− 0
View file @ 3e402491
import("system.result");
result.string("87d4ff5b-0ab6-4534-be26-76c6ef486072");
\ No newline at end of file
entity/Employee_entity/entityfields/departments/children/attrparenttype_param/valueProcess.js 0 → 100644
+ 3
− 0
View file @ 3e402491
import("system.result");
import("Attribute_lib");
result.string($AttributeTypes.VOID);
\ No newline at end of file
entity/Employee_entity/entityfields/email_address/possibleItemsProcess.js
+ 0
− 2
View file @ 3e402491
......@@ -26,5 +26,3 @@ if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.r
result.object(addresses);
}
else
result.object([]);
entity/Employee_entity/recordcontainers/jdito/contentProcess.js
+ 3
− 3
View file @ 3e402491
import("Attribute_lib");
import("system.vars");
import("system.result");
import("system.tools");
import("Util_lib");
import("Contact_lib");
import("JditoFilter_lib");
import("Employee_lib");
var users;
if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
......@@ -31,14 +31,14 @@ users = users.map(function (user)
user[tools.DESCRIPTION],
user[tools.PARAMS][tools.CONTACTID],
ContactUtils.getTitleByContactId(user[tools.PARAMS][tools.CONTACTID]), //TODO: get the names more efficiently
user[tools.PARAMS][tools.FRAME_STOREDSEARCHES]
user[tools.PARAMS].department
];
});
var filter = vars.exists("$local.filter") && vars.get("$local.filter");
//TODO: this is a workaround that filters the records manually, it should be possible to filter the users with a tools.* method
users = JditoFilterUtils.filterRecords(["UID", "TITLE", "TITLE_ORIGINAL", "ISACTIVE", "FIRSTNAME", "LASTNAME", "EMAIL_ADDRESS", "DESCRIPTION", "CONTACT_ID", ""], users, filter);
users = JditoFilterUtils.filterRecords(["UID", "TITLE", "TITLE_ORIGINAL", "ISACTIVE", "FIRSTNAME", "LASTNAME", "EMAIL_ADDRESS", "DESCRIPTION", "CONTACT_ID", "", "DEPARTMENT"], users, filter);
ArrayUtils.sort2d(users, 0, true, false); //sort by username
......
entity/Employee_entity/recordcontainers/jdito/onInsert.js
+ 1
− 0
View file @ 3e402491
......@@ -12,6 +12,7 @@ params[tools.CALENDARID] = vars.get("$field.EMAIL_ADDRESS");
params[tools.CONTACTID] = vars.get("$field.CONTACT_ID");
params[tools.DESCRIPTION] = vars.get("$field.DESCRIPTION");
params[tools.ISACTIVE] = vars.get("$field.ISACTIVE");
params.department = vars.get("$field.DEPARTMENT");
user[tools.TITLE] = vars.get("$field.TITLE");
user[tools.PARAMS] = params;
......
entity/Employee_entity/recordcontainers/jdito/onUpdate.js
+ 1
− 0
View file @ 3e402491
......@@ -27,6 +27,7 @@ user[tools.PARAMS][tools.EMAIL] = vars.get("$field.EMAIL_ADDRESS");
user[tools.PARAMS][tools.CALENDARID] = vars.get("$field.EMAIL_ADDRESS");
user[tools.PARAMS][tools.CONTACTID] = vars.get("$field.CONTACT_ID");
user[tools.PARAMS][tools.DESCRIPTION] = vars.get("$field.DESCRIPTION");
user[tools.PARAMS].department = vars.get("$field.DEPARTMENT");
if (vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param")
&& vars.get("$field.PASSWORD") == vars.get("$field.CONFIRM_PASSWORD"))
......
entity/Person_entity/Person_entity.aod
+ 0
− 3
View file @ 3e402491
......@@ -203,9 +203,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<fieldName>WithPersonIdFilter</fieldName>
</dependency>
<children>
<entityParameter>
<name>WithPrivate_param</name>
</entityParameter>
<entityParameter>
<name>ExcludeOrganisationsByPersonId</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js</valueProcess>
......
entity/Person_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
+ 1
− 1
View file @ 3e402491
import("system.vars");
import("system.result");
result.string(vars.get("$field.PERSONID"));
result.string(vars.get("$field.CONTACTID"));
entity/Person_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
+ 1
− 1
View file @ 3e402491
import("system.vars");
import("system.result");
result.string(vars.get("$field.PERSONID"));
result.string(vars.get("$field.CONTACTID"));
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