diff --git a/.liquibase/Data_alias/basic/2019.2/activity_rename_Creator_to_Responsible.xml b/.liquibase/Data_alias/basic/2019.2/activity_rename_Creator_to_Responsible.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9892f159854d05b95c6dadcc766220e9746d2b61
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/activity_rename_Creator_to_Responsible.xml
@@ -0,0 +1,9 @@
+<?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="j.hoermann" id="5e48c1ac-ceb1-4b93-90b1-900a3c68351d">
+ <renameColumn tableName="ACTIVITY" oldColumnName="CREATOR" newColumnName="RESPONSIBLE"/>
+ <rollback>
+ <renameColumn tableName="ACTIVITY" oldColumnName="RESPONSIBLE" newColumnName="CREATOR"/>
+ </rollback>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.2/changelog.xml b/.liquibase/Data_alias/basic/2019.2/changelog.xml
index 9a955cdae7d56bd055fa215b1cdb0a9b3ffd5a12..6a701d31399531e8786b63f708ce9379adc975ab 100644
--- a/.liquibase/Data_alias/basic/2019.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.2/changelog.xml
@@ -143,6 +143,6 @@
<include relativeToChangelogFile="true" file="change_Milestone_datatype_to_new_Keyword_logic_Derby.xml" />
<include relativeToChangelogFile="true" file="update_Milestone_to_new_Keyword.xml" />
+ <include relativeToChangelogFile="true" file="create_documenttemplate.xml"/>
<include relativeToChangelogFile="true" file="create_documenttemplatelink.xml"/>
- <include relativeToChangelogFile="true" file="data/init_DocumentTemplateType.xml"/>
</databaseChangeLog>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index d26fdda8e4479a0024e96fdaa2beb9813204f954..158fb691952c860c8b35865ce3e077cd83535f49 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -3346,20 +3346,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>CREATOR</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>PARENT_CONTEXT</name>
<dbName></dbName>
@@ -3444,6 +3430,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>RESPONSIBLE</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>
<entityDb>
@@ -4426,20 +4426,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>ATTRIBUTE_LEVEL</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>KEYWORD_CONTAINER</name>
<dbName></dbName>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index cd65065c38663b5ab510ec227d4807fbf1260f4d..60c021ac7ba8e2346d20190ac87f81325a865dd7 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -260,13 +260,13 @@
</children>
</entityProvider>
<entityField>
- <name>CREATOR</name>
- <title>Creator</title>
+ <name>RESPONSIBLE</name>
+ <title>Responsible</title>
<consumer>Employees</consumer>
<linkedContext>Person</linkedContext>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/creator/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/creator/displayValueProcess.js</displayValueProcess>
+ <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/responsible/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/responsible/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>ModuleTrees</name>
@@ -478,10 +478,6 @@
<name>DIRECTION.displayValue</name>
<expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/direction.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CREATOR.value</name>
- <recordfield>ACTIVITY.CREATOR</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PARENT_CONTEXT.value</name>
<recordfield>ACTIVITY.PARENT_CONTEXT</recordfield>
@@ -494,10 +490,6 @@
<name>CATEGORY.displayValue</name>
<expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CREATOR.displayValue</name>
- <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/creator.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_NEW.value</name>
<recordfield>ACTIVITY.USER_NEW</recordfield>
@@ -514,6 +506,14 @@
<name>DATE_EDIT.value</name>
<recordfield>ACTIVITY.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>RESPONSIBLE.displayValue</name>
+ <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/responsible.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>RESPONSIBLE.value</name>
+ <recordfield>ACTIVITY.RESPONSIBLE</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Activity_entity/entityfields/creator/displayValueProcess.js b/entity/Activity_entity/entityfields/responsible/displayValueProcess.js
similarity index 100%
rename from entity/Activity_entity/entityfields/creator/displayValueProcess.js
rename to entity/Activity_entity/entityfields/responsible/displayValueProcess.js
diff --git a/entity/Activity_entity/entityfields/creator/valueProcess.js b/entity/Activity_entity/entityfields/responsible/valueProcess.js
similarity index 100%
rename from entity/Activity_entity/entityfields/creator/valueProcess.js
rename to entity/Activity_entity/entityfields/responsible/valueProcess.js
diff --git a/entity/Activity_entity/recordcontainers/db/conditionProcess.js b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
index c772668cbde4f80831fa000cd266d7e6d8cc97af..9e14d0b2ef2ed8f4ad75bbee6884c2d96c9bcd92 100644
--- a/entity/Activity_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
@@ -23,7 +23,7 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
}
if(vars.exists("$param.OnlyInnate_param") && vars.get("$param.OnlyInnate_param")) {
- cond.andPrepare("ACTIVITY.CREATOR", vars.get("$sys.user"));
+ cond.andPrepare("ACTIVITY.RESPONSIBLE", vars.get("$sys.user"));
}
//TODO: use a preparedCondition when available #1030812 #1034026
diff --git a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/creator.displayvalue/expression.js b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/creator.displayvalue/expression.js
deleted file mode 100644
index 411a003b91936f9c3e8681311ff40e1f1e010ad6..0000000000000000000000000000000000000000
--- a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/creator.displayvalue/expression.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Person_lib");
-
-result.string(PersUtils.getResolvingDisplaySubSql("CREATOR"))
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/responsible.displayvalue/expression.js b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/responsible.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..fdec89201f8a11f9163187314f21c55ba7f15735
--- /dev/null
+++ b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/responsible.displayvalue/expression.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Person_lib");
+
+result.string(PersUtils.getResolvingDisplaySubSql("RESPONSIBLE"))
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 96740e3edd137fabb213edaf226d9a24b8328ab3..2c01af8b0ed6800074b7b7d750bed52a6e467732 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -1060,7 +1060,7 @@
<key>Benutzer</key>
</entry>
<entry>
- <key>Schlüsselwort</key>
+ <key>Schl�sselwort</key>
</entry>
<entry>
<key>{$TASK_PRIORITY_NONE}</key>
@@ -1267,7 +1267,7 @@
<key>Jordan</key>
</entry>
<entry>
- <key>Côte d'Ivoire</key>
+ <key>C�te d'Ivoire</key>
</entry>
<entry>
<key>United Arab Emirates</key>
@@ -1636,7 +1636,7 @@
<key>Kazakhstan</key>
</entry>
<entry>
- <key>Ã…land Islands</key>
+ <key>�land Islands</key>
</entry>
<entry>
<key>Bahamas</key>
@@ -1915,7 +1915,7 @@
<key>Ukraine</key>
</entry>
<entry>
- <key>Curaçao</key>
+ <key>Cura�ao</key>
</entry>
<entry>
<key>Anguilla</key>
@@ -2014,7 +2014,7 @@
<key>ended</key>
</entry>
<entry>
- <key>Saint Barthélemy</key>
+ <key>Saint Barth�lemy</key>
</entry>
<entry>
<key>Wallis and Futuna</key>
@@ -2032,7 +2032,7 @@
<key>Hungary</key>
</entry>
<entry>
- <key>Réunion</key>
+ <key>R�union</key>
</entry>
<entry>
<key>Japan</key>
@@ -2440,7 +2440,7 @@
<key>Other Contactroles</key>
</entry>
<entry>
- <key>Bitte Datumseingabe prüfen!</key>
+ <key>Bitte Datumseingabe pr�fen!</key>
</entry>
<entry>
<key>In Bearbeitung</key>
@@ -2455,10 +2455,10 @@
<key>Bitte Filterbedingungen setzen</key>
</entry>
<entry>
- <key>Bestätigt</key>
+ <key>Best�tigt</key>
</entry>
<entry>
- <key>Vorläufig</key>
+ <key>Vorl�ufig</key>
</entry>
<entry>
<key>keine</key>
@@ -2473,7 +2473,7 @@
<key>&Aufgaben (%0)</key>
</entry>
<entry>
- <key>erledigt / zurückgestellt</key>
+ <key>erledigt / zur�ckgestellt</key>
</entry>
<entry>
<key>hoch</key>
@@ -2482,7 +2482,7 @@
<key>Keine Berechtigung zum Verschieben der Aufgabe</key>
</entry>
<entry>
- <key>Zurückgestellt</key>
+ <key>Zur�ckgestellt</key>
</entry>
<entry>
<key>Erledigt</key>
@@ -2494,13 +2494,13 @@
<key>Abgesagt</key>
</entry>
<entry>
- <key>Außer Haus</key>
+ <key>Au�er Haus</key>
</entry>
<entry>
<key>Abbrechen</key>
</entry>
<entry>
- <key>Benutzer auswählen</key>
+ <key>Benutzer ausw�hlen</key>
</entry>
<entry>
<key>delegiert</key>
@@ -2509,7 +2509,7 @@
<key>frei</key>
</entry>
<entry>
- <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
+ <key>Kein Weitergeben von privaten Aufgaben m�glich!</key>
</entry>
<entry>
<key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 632147d1e3eb84558e0f340ad7e524cbb1baf1d3..2df8cb8a4e92470020c468dadb1fc809cb14638f 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -78,10 +78,6 @@
<key>Show all activities</key>
<value>Alle Aktivitäten anzeigen</value>
</entry>
- <entry>
- <key>Document Template</key>
- <value>Dokumenten-Vorlage</value>
- </entry>
<entry>
<key>${ADDRESS_STATE}</key>
<value>Staat</value>
@@ -369,10 +365,6 @@
<key>City</key>
<value>Ort</value>
</entry>
- <entry>
- <key>Text Modular</key>
- <value>Textbaustein</value>
- </entry>
<entry>
<key>State</key>
<value>Status</value>
@@ -802,10 +794,6 @@
<key>Won</key>
<value>Gewonnen</value>
</entry>
- <entry>
- <key>Letter</key>
- <value>Brief</value>
- </entry>
<entry>
<key>Checked</key>
<value>Geprüft</value>
@@ -1505,7 +1493,6 @@
</entry>
<entry>
<key>asdf</key>
- <value></value>
</entry>
<entry>
<key>{$TASK_STATUS}</key>
@@ -1726,10 +1713,6 @@
<key>New attribute</key>
<value>Neues Attribut</value>
</entry>
- <entry>
- <key>Attachment</key>
- <value>Anhang</value>
- </entry>
<entry>
<key>Solomon Islands</key>
<value>Salomon-Inseln</value>
@@ -3693,6 +3676,44 @@
<entry>
<key>Would you like to clear the forecast and set the state to \"%0\"?</key>
</entry>
+ <entry>
+ <key>[%0]the tableName is not a string after interpreting</key>
+ </entry>
+ <entry>
+ <key>[%0]%1 has to be a string or array but it is %2</key>
+ </entry>
+ <entry>
+ <key>[%0]has now an incorrect length; estimated 2 elements but got %1</key>
+ </entry>
+ <entry>
+ <key>[%0]the columnName is not a string after interpreting</key>
+ </entry>
+ <entry>
+ <key>[%0]%1 is an object but seems not to be a valid array or array-like</key>
+ </entry>
+ <entry>
+ <key>Responsible</key>
+ <value>Verantwortlich</value>
+ </entry>
+ <entry>
+ <key>Analyses</key>
+ </entry>
+ <entry>
+ <key>Imminent appointments for today </key>
+ </entry>
+ <entry>
+ <key>To-Do</key>
+ </entry>
+ <entry>
+ <key>My Tasks</key>
+ </entry>
+ <entry>
+ <key>Calendar</key>
+ </entry>
+ <entry>
+ <key>${SQL_LIB_UNDEFINED_VALUE} field: %0</key>
+ <value>Der Wert für das Feld %0 ist undefined.</value>
+ </entry>
<entry>
<key>Au�er Haus</key>
</entry>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index a64d87fef263de08e735bf9303d8f074e5438f52..9427601bb81029f1d1a087290b2692dc1405c6d9 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2596,46 +2596,46 @@
<key>New module</key>
</entry>
<entry>
- <key>C�te d'Ivoire</key>
+ <key>Côte d'Ivoire</key>
</entry>
<entry>
- <key>Bitte Datumseingabe pr�fen!</key>
+ <key>Bitte Datumseingabe prüfen!</key>
</entry>
<entry>
- <key>Best�tigt</key>
+ <key>Bestätigt</key>
</entry>
<entry>
- <key>Vorl�ufig</key>
+ <key>Vorläufig</key>
</entry>
<entry>
- <key>Saint Barth�lemy</key>
+ <key>Saint Barthélemy</key>
</entry>
<entry>
- <key>erledigt / zur�ckgestellt</key>
+ <key>erledigt / zurückgestellt</key>
</entry>
<entry>
- <key>Zur�ckgestellt</key>
+ <key>Zurückgestellt</key>
</entry>
<entry>
- <key>Au�er Haus</key>
+ <key>Außer Haus</key>
</entry>
<entry>
- <key>Benutzer ausw�hlen</key>
+ <key>Benutzer auswählen</key>
</entry>
<entry>
- <key>�land Islands</key>
+ <key>Ã…land Islands</key>
</entry>
<entry>
- <key>Kein Weitergeben von privaten Aufgaben m�glich!</key>
+ <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
</entry>
<entry>
- <key>Cura�ao</key>
+ <key>Curaçao</key>
</entry>
<entry>
- <key>Schl�sselwort</key>
+ <key>Schlüsselwort</key>
</entry>
<entry>
- <key>R�union</key>
+ <key>Réunion</key>
</entry>
<entry>
<key>date of birth must not be in the future</key>
@@ -2914,6 +2914,55 @@
<entry>
<key>This cannot be undone!</key>
</entry>
+ <entry>
+ <key>Overdue tasks</key>
+ </entry>
+ <entry>
+ <key>Open tasks</key>
+ </entry>
+ <entry>
+ <key>[%0]the tableName is not a string after interpreting</key>
+ </entry>
+ <entry>
+ <key>[%0]%1 has to be a string or array but it is %2</key>
+ </entry>
+ <entry>
+ <key>[%0]has now an incorrect length; estimated 2 elements but got %1</key>
+ </entry>
+ <entry>
+ <key>[%0]the columnName is not a string after interpreting</key>
+ </entry>
+ <entry>
+ <key>[%0]%1 is an object but seems not to be a valid array or array-like</key>
+ </entry>
+ <entry>
+ <key>Responsible</key>
+ </entry>
+ <entry>
+ <key>New tasks</key>
+ </entry>
+ <entry>
+ <key>Imminent appointments for today</key>
+ </entry>
+ <entry>
+ <key>Analyses</key>
+ </entry>
+ <entry>
+ <key>Imminent appointments for today </key>
+ </entry>
+ <entry>
+ <key>To-Do</key>
+ </entry>
+ <entry>
+ <key>My Tasks</key>
+ </entry>
+ <entry>
+ <key>Calendar</key>
+ </entry>
+ <entry>
+ <key>${SQL_LIB_UNDEFINED_VALUE} field: %0</key>
+ <value>The value for the field %0 is undefined.</value>
+ </entry>
<entry>
<key>Zurückgestellt</key>
</entry>
diff --git a/neonView/ActivityEdit_view/ActivityEdit_view.aod b/neonView/ActivityEdit_view/ActivityEdit_view.aod
index 2e264c062b2b33f739bd8a1b7c8bb94943f22078..4a16fe2dd5f1e1ef88a07a1e8230ba5c1b62a17d 100644
--- a/neonView/ActivityEdit_view/ActivityEdit_view.aod
+++ b/neonView/ActivityEdit_view/ActivityEdit_view.aod
@@ -38,7 +38,7 @@
</entityFieldLink>
<entityFieldLink>
<name>91514e62-f4f7-4eb7-84c0-8d94adbb3408</name>
- <entityField>CREATOR</entityField>
+ <entityField>RESPONSIBLE</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
diff --git a/neonView/ActivityPreview_view/ActivityPreview_view.aod b/neonView/ActivityPreview_view/ActivityPreview_view.aod
index e142cb9bf33ee4d6acce56e5463e8ca7e6f05c67..695059b3a6af398a2ffb8990642ed12832a7cbc2 100644
--- a/neonView/ActivityPreview_view/ActivityPreview_view.aod
+++ b/neonView/ActivityPreview_view/ActivityPreview_view.aod
@@ -35,7 +35,7 @@
</entityFieldLink>
<entityFieldLink>
<name>c4569e50-223e-4b99-8253-e8fa72ef45a0</name>
- <entityField>CREATOR</entityField>
+ <entityField>RESPONSIBLE</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>