Skip to content
Snippets Groups Projects
Commit 5b0813b6 authored by Benjamin Ulrich's avatar Benjamin Ulrich :speech_balloon:
Browse files

Merge branch '2021.1_1070092_Grouptasks_mw' into '2021.1' 

2021.1 1070092 grouptasks mw

See merge request xrm/basic!1089
parents 06b3ea64 f644b3ba
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1028 additions and 266 deletions
.liquibase/Data_alias/basic/2021.1.2/changelog.xml
+ 1
− 1
View file @ 5b0813b6
......@@ -8,4 +8,4 @@
<include relativeToChangelogFile="true" file="Registration_Webservice/changelog.xml"/>
<include relativeToChangelogFile="true" file="VisitPlan/changelog.xml"/>
<include relativeToChangelogFile="true" file="Duplicate/changelog.xml"/>
</databaseChangeLog>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.1.3/Grouptask/add_ColumnTask.xml 0 → 100644
+ 11
− 0
View file @ 5b0813b6
<?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-4.1.xsd">
<changeSet author="m.wachsmuth" id="7a2f96e5-3aa5-4468-95b1-41ec722ed7a4">
<addColumn tableName="TASK">
<column name="DATE_EDIT" type="DATETIME"/>
<column name="DATE_NEW" type="DATETIME"/>
<column name="USER_NEW" type="VARCHAR(30)"/>
<column name="USER_EDIT" type="VARCHAR(30)"/>
</addColumn>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.1.3/Grouptask/changelog.xml 0 → 100644
+ 6
− 0
View file @ 5b0813b6
<?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="add_ColumnTask.xml"/>
<include relativeToChangelogFile="true" file="create_TaskAttendees.xml"/>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.1.3/Grouptask/create_TaskAttendees.xml 0 → 100644
+ 27
− 0
View file @ 5b0813b6
<?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-4.1.xsd">
<changeSet author="m.wachsmuth" id="781b015e-b53d-4d32-bec7-d68af0ac3d42">
<createTable tableName="TASKATTENDEES">
<column name="TASKATTENDEESID" type="CHAR(36)">
<constraints nullable="false" primaryKey="true" primaryKeyName="PK_TASKATTENDEESID"/>
</column>
<column name="CONTACT_ID" type="CHAR(36)"/>
<column name="TASK_ID" type="CHAR(36)"/>
<column name="DEPARTMENT_ID" type="CHAR(36)"/>
<column name="DATE_EDIT" type="DATETIME"/>
<column name="DATE_NEW" type="DATETIME"/>
<column name="USER_NEW" type="VARCHAR(30)"/>
<column name="USER_EDIT" type="VARCHAR(30)"/>
</createTable>
</changeSet>
<changeSet author="m.wachsmuth" id="cca1cd75-42e5-4397-b091-77ae5d774638">
<createIndex indexName="IDX_CONTACT_ID" tableName="TASKATTENDEES">
<column name="CONTACT_ID"/>
</createIndex>
</changeSet>
<changeSet author="m.wachsmuth" id="c9926883-a66b-41bb-a209-bbda0f51aaee">
<createIndex indexName="IDX_DEPARTMENT_ID" tableName="TASKATTENDEES">
<column name="DEPARTMENT_ID"/>
</createIndex>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.1.3/changelog.xml
+ 1
− 1
View file @ 5b0813b6
......@@ -2,8 +2,8 @@
<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="defaultWeblinks/changelog.xml"/>
<include relativeToChangelogFile="true" file="Checklist/changelog.xml"/>
<include relativeToChangelogFile="true" file="alter_dataTypesToDateTime.xml"/>
<include relativeToChangelogFile="true" file="Grouptask/changelog.xml"/>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/_demoData/changelog.xml
+ 1
− 0
View file @ 5b0813b6
......@@ -101,6 +101,7 @@
<include file="generatedData/standard_workflow.xml" relativeToChangelogFile="true"/>
<include file="generatedData/stock.xml" relativeToChangelogFile="true"/>
<include file="generatedData/task.xml" relativeToChangelogFile="true"/>
<include file="generatedData/taskattendees.xml" relativeToChangelogFile="true"/>
<include file="generatedData/tasklink.xml" relativeToChangelogFile="true"/>
<include file="generatedData/ticket.xml" relativeToChangelogFile="true"/>
<include file="generatedData/timetracking.xml" relativeToChangelogFile="true"/>
......
.liquibase/Data_alias/basic/_demoData/generatedData/taskattendees.xml 0 → 100644
+ 186
− 0
View file @ 5b0813b6
<?xml version="1.0" encoding="UTF-8"?>
<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-4.1.xsd">
<changeSet author="s.pongratz" id="3e27f9be-66ff-4d51-8ecf-76f04abb49ed">
<delete tableName="TASKATTENDEES"/>
<insert tableName="TASKATTENDEES">
<column name="TASKATTENDEESID" value="2aa5b8db-53fa-4ba7-93fb-2524afa94006" />
<column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9" />
<column name="TASK_ID" value="0066cd29-a246-4a8c-8c11-c507538d997b" />
<column name="DEPARTMENT_ID" />
<column name="DATE_EDIT" />
<column name="DATE_NEW" valueDate="2021-08-03T13:16:21" />
<column name="USER_NEW" value="Admin" />
<column name="USER_EDIT" />
</insert>
<insert tableName="TASKATTENDEES">
<column name="TASKATTENDEESID" value="f3032256-a2a8-48b3-ad18-783ea18b6f02" />
<column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb" />
<column name="TASK_ID" value="0d126a7e-4308-4857-9245-5a40f3e2b36e" />
<column name="DEPARTMENT_ID" />
<column name="DATE_EDIT" />
<column name="DATE_NEW" valueDate="2021-08-03T13:16:21" />
<column name="USER_NEW" value="Admin" />
<column name="USER_EDIT" />
</insert>
<insert tableName="TASKATTENDEES">
<column name="TASKATTENDEESID" value="5801ac8b-eed3-48b0-b29d-eccec729b29e" />
<column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729" />
<column name="TASK_ID" value="2e50d2cd-9429-433c-8f6e-2e31a9e7908e" />
<column name="DEPARTMENT_ID" />
<column name="DATE_EDIT" />
<column name="DATE_NEW" valueDate="2021-08-03T13:16:21" />
<column name="USER_NEW" value="Admin" />
<column name="USER_EDIT" />
</insert>
<insert tableName="TASKATTENDEES">
<column name="TASKATTENDEESID" value="b86a3835-c406-4206-891e-d3cfa8a6157a" />
<column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb" />
<column name="TASK_ID" value="380c1ae1-c7d4-49b7-87e1-4fe2e16c4c52" />
<column name="DEPARTMENT_ID" />
<column name="DATE_EDIT" />
<column name="DATE_NEW" valueDate="2021-08-03T13:16:21" />
<column name="USER_NEW" value="Admin" />
<column name="USER_EDIT" />
</insert>
<insert tableName="TASKATTENDEES">
<column name="TASKATTENDEESID" value="e48dd6ef-7ee0-4bd4-8e4a-f3b9ddcf3e6a" />
<column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9" />
<column name="TASK_ID" value="51cfa90a-93be-4d26-97ae-05f050631543" />
<column name="DEPARTMENT_ID" />
<column name="DATE_EDIT" />
<column name="DATE_NEW" valueDate="2021-08-03T13:16:21" />
<column name="USER_NEW" value="Admin" />
<column name="USER_EDIT" />
</insert>
<insert tableName="TASKATTENDEES">
<column name="TASKATTENDEESID" value="10a0a39a-72d1-4ff0-a47a-da9a356dd9ea" />
<column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729" />
<column name="TASK_ID" value="67afcc4b-f71b-4da6-a8b3-e7947c411a2a" />
<column name="DEPARTMENT_ID" />
<column name="DATE_EDIT" />
<column name="DATE_NEW" valueDate="2021-08-03T13:16:21" />
<column name="USER_NEW" value="Admin" />
<column name="USER_EDIT" />
</insert>
<insert tableName="TASKATTENDEES">
<column name="TASKATTENDEESID" value="e4788d62-6273-464b-b9cb-0f44580803a7" />
<column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87" />
<column name="TASK_ID" value="783f38b6-db71-42b5-9117-848553905c93" />
<column name="DEPARTMENT_ID" />
<column name="DATE_EDIT" />
<column name="DATE_NEW" valueDate="2021-08-03T13:16:21" />
<column name="USER_NEW" value="Admin" />
<column name="USER_EDIT" />
</insert>
<insert tableName="TASKATTENDEES">
<column name="TASKATTENDEESID" value="3d2c9654-5a6b-4683-8095-590a1b58575a" />
<column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb" />
<column name="TASK_ID" value="7d404da2-78bf-427b-8abb-4c7e953220ca" />
<column name="DEPARTMENT_ID" />
<column name="DATE_EDIT" />
<column name="DATE_NEW" valueDate="2021-08-03T13:16:21" />
<column name="USER_NEW" value="Admin" />
<column name="USER_EDIT" />
</insert>
<insert tableName="TASKATTENDEES">
<column name="TASKATTENDEESID" value="8808a4f1-e4c3-4c0c-a7c1-c4c2e07e1162" />
<column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb" />
<column name="TASK_ID" value="81a4c8e7-4429-41e1-a534-f1be21e56b5e" />
<column name="DEPARTMENT_ID" />
<column name="DATE_EDIT" />
<column name="DATE_NEW" valueDate="2021-08-03T13:16:21" />
<column name="USER_NEW" value="Admin" />
<column name="USER_EDIT" />
</insert>
<insert tableName="TASKATTENDEES">
<column name="TASKATTENDEESID" value="61501abc-cbe6-46b4-a668-073e4db0377c" />
<column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb" />
<column name="TASK_ID" value="81a4d411-f317-4080-84b6-55ed91d26d34" />
<column name="DEPARTMENT_ID" />
<column name="DATE_EDIT" />
<column name="DATE_NEW" valueDate="2021-08-03T13:16:21" />
<column name="USER_NEW" value="Admin" />
<column name="USER_EDIT" />
</insert>
<insert tableName="TASKATTENDEES">
<column name="TASKATTENDEESID" value="7a76482d-28b7-49bb-80d7-520b10bafd11" />
<column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729" />
<column name="TASK_ID" value="96ec8b48-9fac-4216-bc98-a8323f0592f9" />
<column name="DEPARTMENT_ID" />
<column name="DATE_EDIT" />
<column name="DATE_NEW" valueDate="2021-08-03T13:16:21" />
<column name="USER_NEW" value="Admin" />
<column name="USER_EDIT" />
</insert>
<insert tableName="TASKATTENDEES">
<column name="TASKATTENDEESID" value="652b0326-f33b-4f2e-9dae-883ddc2eec7c" />
<column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729" />
<column name="TASK_ID" value="cb00abc2-afc7-4cde-9e44-baf02248edd2" />
<column name="DEPARTMENT_ID" />
<column name="DATE_EDIT" />
<column name="DATE_NEW" valueDate="2021-08-03T13:16:21" />
<column name="USER_NEW" value="Admin" />
<column name="USER_EDIT" />
</insert>
<insert tableName="TASKATTENDEES">
<column name="TASKATTENDEESID" value="fb926b3b-6bc9-4dff-b14e-33281b9472c2" />
<column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729" />
<column name="TASK_ID" value="cf99cace-a6e1-46a6-ad83-c634e373f320" />
<column name="DEPARTMENT_ID" />
<column name="DATE_EDIT" />
<column name="DATE_NEW" valueDate="2021-08-03T13:16:21" />
<column name="USER_NEW" value="Admin" />
<column name="USER_EDIT" />
</insert>
<insert tableName="TASKATTENDEES">
<column name="TASKATTENDEESID" value="0f929021-df89-4dec-b393-58b72222b346" />
<column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87" />
<column name="TASK_ID" value="d6217dc5-5585-4919-a545-9cdc64a1ca58" />
<column name="DEPARTMENT_ID" />
<column name="DATE_EDIT" />
<column name="DATE_NEW" valueDate="2021-08-03T13:16:21" />
<column name="USER_NEW" value="Admin" />
<column name="USER_EDIT" />
</insert>
<insert tableName="TASKATTENDEES">
<column name="TASKATTENDEESID" value="0096a10b-324a-4a2a-b72e-237e8490bffc" />
<column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729" />
<column name="TASK_ID" value="d8f35764-2c56-45be-93c7-f1e0695e2417" />
<column name="DEPARTMENT_ID" />
<column name="DATE_EDIT" />
<column name="DATE_NEW" valueDate="2021-08-03T13:16:21" />
<column name="USER_NEW" value="Admin" />
<column name="USER_EDIT" />
</insert>
<insert tableName="TASKATTENDEES">
<column name="TASKATTENDEESID" value="5b226e0c-97db-4a06-87c5-38d2bf49fa14" />
<column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb" />
<column name="TASK_ID" value="e9cb198d-c420-4192-9c29-b23682457d8e" />
<column name="DEPARTMENT_ID" />
<column name="DATE_EDIT" />
<column name="DATE_NEW" valueDate="2021-08-03T13:16:21" />
<column name="USER_NEW" value="Admin" />
<column name="USER_EDIT" />
</insert>
<insert tableName="TASKATTENDEES">
<column name="TASKATTENDEESID" value="8565d5d0-40f7-46a6-8d0e-1cb272f658c4" />
<column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729" />
<column name="TASK_ID" value="eadbfbc2-3664-49c8-bda1-b6f8e15e5f21" />
<column name="DEPARTMENT_ID" />
<column name="DATE_EDIT" />
<column name="DATE_NEW" valueDate="2021-08-03T13:16:21" />
<column name="USER_NEW" value="Admin" />
<column name="USER_EDIT" />
</insert>
<insert tableName="TASKATTENDEES">
<column name="TASKATTENDEESID" value="61c4a865-ce1f-437e-80ca-cdc4c15082c8" />
<column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729" />
<column name="TASK_ID" value="f8fcdce1-da60-46d6-9ce3-3866e093730d" />
<column name="DEPARTMENT_ID" />
<column name="DATE_EDIT" />
<column name="DATE_NEW" valueDate="2021-08-03T13:16:21" />
<column name="USER_NEW" value="Admin" />
<column name="USER_EDIT" />
</insert>
</changeSet>
</databaseChangeLog>
aliasDefinition/Data_alias/Data_alias.aod
+ 193
− 5
View file @ 5b0813b6
......@@ -5417,8 +5417,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="19" />
<scale v="0" />
<size v="29" />
<scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
......@@ -5510,7 +5510,7 @@
<name>DESCRIPTION</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="-1" />
<columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
......@@ -5612,8 +5612,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="19" />
<scale v="0" />
<size v="29" />
<scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
......@@ -5722,6 +5722,62 @@
</customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="29" />
<scale v="9" />
<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="30" />
<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="29" />
<scale v="9" />
<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="30" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
......@@ -21852,6 +21908,138 @@
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
<name>TASKATTENDEES</name>
<dbName></dbName>
<idColumn>TASKATTENDEESID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<documentation></documentation>
<title></title>
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
<auditMode v="0" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
<syncIds></syncIds>
</auditSyncConfig>
<entityFields>
<entityFieldDb>
<name>DEPARTMENT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="29" />
<scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="29" />
<scale v="9" />
<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="30" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>TASKATTENDEESID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>TASK_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<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="30" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
</entities>
</entityGroup>
</aliasDefDb>
......
entity/Activity_entity/entityfields/newtask/onActionProcess.js
+ 1
− 1
View file @ 5b0813b6
......@@ -2,4 +2,4 @@ import("system.vars");
import("ActivityTask_lib");
import("Context_lib");
TaskUtils.createNewTask(undefined, undefined, ContextUtils.getCurrentContextId(), vars.get("$field.ACTIVITYID"));
\ No newline at end of file
TaskUtils.createNewTask(undefined, undefined, ContextUtils.getCurrentContextId(), vars.get("$field.ACTIVITYID"), {"Description_param" : vars.get("$field.INFO"), "Subject_param": vars.get("$field.SUBJECT")});
\ No newline at end of file
entity/Advertising_entity/documentation.adoc
+ 3
− 3
View file @ 5b0813b6
==Advertising_entity
== Advertising_entity
An Entity for handling the process of Advertising Shipment
Advertising has a 1 : n relationship to AdvertisingItems
......@@ -10,7 +10,7 @@ Currency : the currency in which the items should be processed
Row_ID : the linked data set currently activity
Date_new : creation date of the advertising shipment
=Where to start
= Where to start
In the current version (2021.1.0) Advertisings are linked to an Activity (this can change in the future)
While creating a new Activity the user has the possibility to say 'has Advertisings'
If opt in, the needed data will be prepared in the background.
......@@ -61,7 +61,7 @@ you can have up to 3 workflow instances. In order to group the sending by handov
Depending on which handover type there are different actions:
-personal
The advertising was given directly in person to a contact -> a follow up task will be generated after a defined amount of time currently 5M
The advertising was given directly in person to a contact - > a follow up task will be generated after a defined amount of time currently 5M
(for testing you can change the time in the workflow)
-post /mail
The item will be send via mail so a usertask is generated which provides the needed information -> after that a follow up task will be generated
......
entity/Contract_entity/Contract_entity.aod
+ 1
− 0
View file @ 5b0813b6
......@@ -355,6 +355,7 @@
<entityParameter>
<name>PresetLinks_param</name>
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
</children>
</entityConsumer>
......
entity/Object_entity/Object_entity.aod
+ 1
− 1
View file @ 5b0813b6
......@@ -210,7 +210,7 @@
<dependency>
<name>dependency</name>
<entityName>Task_entity</entityName>
<fieldName>#PROVIDER</fieldName>
<fieldName>Tasks</fieldName>
</dependency>
</entityConsumer>
<entityProvider>
......
entity/TaskAttendees_entity/TaskAttendees_entity.aod 0 → 100644
+ 163
− 0
View file @ 5b0813b6
<?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.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>TaskAttendees_entity</name>
<title>Attendee</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<titlePlural>Attendees</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
<entityField>
<name>CONTACT_ID</name>
<title>Attendee</title>
<consumer>ContactEmployee</consumer>
<linkedContext>Person</linkedContext>
<displayValueProcess>%aditoprj%/entity/TaskAttendees_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>TASKATTENDEESID</name>
</entityField>
<entityField>
<name>DATE_NEW</name>
<valueProcess>%aditoprj%/entity/TaskAttendees_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
<valueProcess>%aditoprj%/entity/TaskAttendees_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_NEW</name>
<valueProcess>%aditoprj%/entity/TaskAttendees_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
<valueProcess>%aditoprj%/entity/TaskAttendees_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>TASK_ID</name>
<valueProcess>%aditoprj%/entity/TaskAttendees_entity/entityfields/task_id/valueProcess.js</valueProcess>
</entityField>
<entityProvider>
<name>TaskAttendee</name>
</entityProvider>
<entityField>
<name>grouptask</name>
<title>Grouptask</title>
<contentType>BOOLEAN</contentType>
</entityField>
<entityConsumer>
<name>ContactEmployee</name>
<dependency>
<name>dependency</name>
<entityName>Employee_entity</entityName>
<fieldName>Employees</fieldName>
</dependency>
</entityConsumer>
<entityParameter>
<name>RowId_param</name>
<expose v="true" />
</entityParameter>
<entityField>
<name>DEPARTMENT_ID</name>
<title>Department</title>
<consumer>Departments</consumer>
<displayValueProcess>%aditoprj%/entity/TaskAttendees_entity/entityfields/department_id/displayValueProcess.js</displayValueProcess>
<onValidation>%aditoprj%/entity/TaskAttendees_entity/entityfields/department_id/onValidation.js</onValidation>
</entityField>
<entityConsumer>
<name>Departments</name>
<dependency>
<name>dependency</name>
<entityName>Attribute_entity</entityName>
<fieldName>SpecificAttribute</fieldName>
</dependency>
<children>
<entityParameter>
<name>ParentId_param</name>
<valueProcess>%aditoprj%/entity/TaskAttendees_entity/entityfields/departments/children/parentid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityParameter>
<name>DepartmentsOnly_param</name>
<valueProcess>%aditoprj%/entity/TaskAttendees_entity/entityfields/departmentsonly_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
<entityField>
<name>isDepartment</name>
<valueProcess>%aditoprj%/entity/TaskAttendees_entity/entityfields/isdepartment/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/TaskAttendees_entity/entityfields/isdepartment/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>rowID</name>
<linkedContextProcess>%aditoprj%/entity/TaskAttendees_entity/entityfields/rowid/linkedContextProcess.js</linkedContextProcess>
<valueProcess>%aditoprj%/entity/TaskAttendees_entity/entityfields/rowid/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/TaskAttendees_entity/entityfields/rowid/displayValueProcess.js</displayValueProcess>
</entityField>
<entityParameter>
<name>PersonsOnly_param</name>
<expose v="true" />
</entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<conditionProcess>%aditoprj%/entity/TaskAttendees_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/TaskAttendees_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>TASKATTENDEESID.value</name>
<recordfield>TASKATTENDEES.TASKATTENDEESID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.value</name>
<recordfield>TASKATTENDEES.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TASK_ID.value</name>
<recordfield>TASKATTENDEES.TASK_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_NEW.value</name>
<recordfield>TASKATTENDEES.DATE_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DEPARTMENT_ID.value</name>
<recordfield>TASKATTENDEES.DEPARTMENT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
<recordfield>TASKATTENDEES.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_NEW.value</name>
<recordfield>TASKATTENDEES.USER_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_EDIT.value</name>
<recordfield>TASKATTENDEES.USER_EDIT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.displayValue</name>
<expression>%aditoprj%/entity/TaskAttendees_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
<name>9b7516a8-c092-418e-adba-547f85bcdc8c</name>
<tableName>TASKATTENDEES</tableName>
<primaryKey>TASKATTENDEESID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
</linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
entity/Task_entity/entityfields/editor_contact_id/displayValueProcess.js → entity/TaskAttendees_entity/entityfields/contact_id/displayValueProcess.js
+ 8
− 0
View file @ 5b0813b6
import("Contact_lib");
import("system.result");
import("system.vars");
import("Contact_lib");
var id = vars.get("$field.EDITOR_CONTACT_ID");
//show the simpel title since this will be later an employee-entry and therefore no organisation is needed
var title = ContactUtils.getTitleByContactId(id);
var title = ContactUtils.getTitleByContactId(vars.get("$this.value"));
result.string(title);
\ No newline at end of file
entity/Task_entity/entityfields/protectionlevel/valueProcess.js → entity/TaskAttendees_entity/entityfields/date_edit/valueProcess.js
+ 9
− 0
View file @ 5b0813b6
import("system.util");
import("system.vars");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
result.string("0");
\ No newline at end of file
if (vars.getString("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
{
result.string(vars.get("$sys.date"));
}
\ No newline at end of file
entity/TaskAttendees_entity/entityfields/date_new/valueProcess.js 0 → 100644
+ 9
− 0
View file @ 5b0813b6
import("system.vars");
import("system.result");
import("system.neon");
if (vars.getString("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
result.string(vars.get("$sys.date"));
}
\ No newline at end of file
entity/TaskAttendees_entity/entityfields/department_id/displayValueProcess.js 0 → 100644
+ 5
− 0
View file @ 5b0813b6
import("system.result");
import("system.vars");
import("Attribute_lib");
result.string(AttributeUtil.getFullAttributeName(vars.get("$field.DEPARTMENT_ID"), undefined, true, 1));
entity/TaskAttendees_entity/entityfields/department_id/onValidation.js 0 → 100644
+ 13
− 0
View file @ 5b0813b6
import("system.translate");
import("system.result");
import("system.vars");
import("system.tools");
if (vars.get("$this.value"))
{
var departmentUser = tools.getUsersByAttribute("department", [vars.get("this.value")], tools.PROFILE_DEFAULT);
if(departmentUser.length == 0)
{
result.string(translate.text("There are no valid employees in the department."));
}
}
entity/TaskAttendees_entity/entityfields/departments/children/parentid_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 5b0813b6
import("AttributeRegistry_basic");
import("system.result");
result.string($AttributeRegistry.departments());
\ 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