Merge origin/PERS_dev

Conflicts: .aditoprj/project.version process/Util_lib/process.js

Merge origin/PERS_dev
9d4ee4a9 · Johannes Goderbauer · 63143ab6 · 50cd32f8 · 9d4ee4a9 · 9d4ee4a9
Commit 9d4ee4a9 authored 6 years ago by Johannes Goderbauer
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -7,6 +7,196 @@
    <aliasDefDb>
      <entityGroup>
        <name>entityGroup</name>
+        <entities>
+          <entityDb>
+            <name>PERS</name>
+            <dbName></dbName>
+            <idColumn>PERSID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <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>TITLESUFFIX</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <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" />
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PERSID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="false" />
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>FIRSTNAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MIDDLENAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATEOFBIRTH</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LASTNAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SALUTATION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="20" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>GENDER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="1" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TITLE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <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" />
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+        </entities>
      </entityGroup>
    </aliasDefDb>
  </aliasDefinitionSub>

--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -2,7 +2,14 @@
 <application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.1.8">
  <name>_____SYSTEM_APPLICATION_NEON</name>
  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <entityNode name="_____SYSTEM_COMPANY" kind="200" />
+  <entityNode name="_____SYSTEM_COMPANY" kind="200">
+    <node name="Group" kind="123" title="">
+      <node name="Group2" kind="123" title="">
+        <node name="Pers_context" kind="10077" />
+        <node name="INTERNAL_ADMINISTRATOR" kind="159" />
+      </node>
+    </node>
+  </entityNode>
  <company>
    <name>company</name>
  </company>

--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
+<?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.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.3">
+  <name>Pers_entity</name>
+  <title>Personen</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <alias>Data_alias</alias>
+  <fromClauseProcess>%aditoprj%/entity/Pers_entity/fromClauseProcess.js</fromClauseProcess>
+  <conditionProcess>%aditoprj%/entity/Pers_entity/conditionProcess.js</conditionProcess>
+  <recordContainerType>DB</recordContainerType>
+  <caption>Personen</caption>
+  <captionProcess>%aditoprj%/entity/Pers_entity/captionProcess.js</captionProcess>
+  <iconId>VAADIN:MALE</iconId>
+  <entityFields>
+    <entityField>
+      <name>DATEOFBIRTH</name>
+      <tableName>PERS</tableName>
+      <columnName>DATEOFBIRTH</columnName>
+      <contentType>DATE</contentType>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <tableName>PERS</tableName>
+      <columnName>DATE_EDIT</columnName>
+      <contentType>DATE</contentType>
+      <outputFormat>dd.MM.yyyy hh:mm</outputFormat>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <tableName>PERS</tableName>
+      <columnName>DATE_NEW</columnName>
+      <contentType>DATE</contentType>
+      <outputFormat>dd.MM.yyyy hh:mm</outputFormat>
+    </entityField>
+    <entityField>
+      <name>FIRSTNAME</name>
+      <tableName>PERS</tableName>
+      <columnName>FIRSTNAME</columnName>
+    </entityField>
+    <entityField>
+      <name>GENDER</name>
+      <tableName>PERS</tableName>
+      <columnName>GENDER</columnName>
+      <possibleItemsProcess>%aditoprj%/entity/Pers_entity/entityfields/gender/possibleItemsProcess.js</possibleItemsProcess>
+    </entityField>
+    <entityField>
+      <name>LASTNAME</name>
+      <tableName>PERS</tableName>
+      <columnName>LASTNAME</columnName>
+    </entityField>
+    <entityField>
+      <name>MIDDLENAME</name>
+      <tableName>PERS</tableName>
+      <columnName>MIDDLENAME</columnName>
+    </entityField>
+    <entityField>
+      <name>PERSID</name>
+      <tableName>PERS</tableName>
+      <columnName>PERSID</columnName>
+    </entityField>
+    <entityField>
+      <name>SALUTATION</name>
+      <tableName>PERS</tableName>
+      <columnName>SALUTATION</columnName>
+    </entityField>
+    <entityField>
+      <name>TITLE</name>
+      <tableName>PERS</tableName>
+      <columnName>TITLE</columnName>
+    </entityField>
+    <entityField>
+      <name>TITLESUFFIX</name>
+      <tableName>PERS</tableName>
+      <columnName>TITLESUFFIX</columnName>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <tableName>PERS</tableName>
+      <columnName>USER_EDIT</columnName>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <tableName>PERS</tableName>
+      <columnName>USER_NEW</columnName>
+    </entityField>
+    <entityField>
+      <name>PREVIEWTITLE</name>
+      <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/previewtitle/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>OrgId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+  </entityFields>
+  <linkInformation>
+    <linkInformation>
+      <name>b29cfc6f-4497-4862-95c4-6bb679db4c51</name>
+      <tableName>PERS</tableName>
+      <primaryKey>PERSID</primaryKey>
+      <isUIDTable v="true" />
+    </linkInformation>
+  </linkInformation>
+</entity>
--- a/entity/Pers_entity/captionProcess.js
+++ b/entity/Pers_entity/captionProcess.js
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.PREVIEWTITLE"))
\ No newline at end of file
--- a/entity/Pers_entity/conditionProcess.js
+++ b/entity/Pers_entity/conditionProcess.js
+import("system.vars");
+import("system.result");
+import("Pers_lib");
+
+var orgId = vars.exists("$param.OrgId_param") && vars.get("$param.OrgId_param")
+            ? vars.get("$param.OrgId_param")
+            : null;
+            
+var paramObject = {
+        "orgId":orgId
+};
+
+var generator = persWhereClauseGenerator(paramObject);
+
+result.string(generator.generate());
\ No newline at end of file
--- a/entity/Pers_entity/entityfields/gender/possibleItemsProcess.js
+++ b/entity/Pers_entity/entityfields/gender/possibleItemsProcess.js
+import("system.vars");
+import("system.result");
+import("system.translate");
+
+//TODO change to keyword after kw are implemented
+var gender = [
+    ["1",translate.text("male")]
+   ,["2",translate.text("female")]
+   ,["3",translate.text("other")]
+];
+
+result.object(gender);
\ No newline at end of file
--- a/entity/Pers_entity/entityfields/previewtitle/valueProcess.js
+++ b/entity/Pers_entity/entityfields/previewtitle/valueProcess.js
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.SALUTATION") 
+              + " " + vars.get("$field.TITLE")
+              + " " + vars.get("$field.FIRSTNAME")
+              + " " + vars.get("$field.MIDDLENAME")
+              + " " + vars.get("$field.LASTNAME")
+              + " " + vars.get("$field.TITLESUFFIX"));
\ No newline at end of file
--- a/entity/Pers_entity/fromClauseProcess.js
+++ b/entity/Pers_entity/fromClauseProcess.js
+import("system.vars");
+import("system.result");
+import("Pers_lib");
+
+var orgId = (vars.exists("$param.OrgId_param") && vars.get("$param.OrgId_param"))
+            ? vars.get("$param.OrgId_param")
+            : null;
+            
+var paramObject = {
+                    "orgId": orgId
+                  };
+
+var generator = persFromClauseGenerator(paramObject);
+
+
+Person.say();
+
+var pers = new Person();
+
+pers.say();
+
+result.string(generator.generate());
\ No newline at end of file
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
--- a/language/_____LANGUAGE_en_US/_____LANGUAGE_en_US.aod
+++ b/language/_____LANGUAGE_en_US/_____LANGUAGE_en_US.aod
--- a/language/_____LANGUAGE_es_ES/_____LANGUAGE_es_ES.aod
+++ b/language/_____LANGUAGE_es_ES/_____LANGUAGE_es_ES.aod
--- a/language/_____LANGUAGE_fr/_____LANGUAGE_fr.aod
+++ b/language/_____LANGUAGE_fr/_____LANGUAGE_fr.aod
--- a/language/_____LANGUAGE_it_IT/_____LANGUAGE_it_IT.aod
+++ b/language/_____LANGUAGE_it_IT/_____LANGUAGE_it_IT.aod
--- a/language/_____LANGUAGE_pl/_____LANGUAGE_pl.aod
+++ b/language/_____LANGUAGE_pl/_____LANGUAGE_pl.aod
--- a/neonContext/Pers_context/Pers_context.aod
+++ b/neonContext/Pers_context/Pers_context.aod
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
+  <name>Pers_context</name>
+  <title>Person</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <mainview>PersMain_view</mainview>
+  <filterview>PersFilter_view</filterview>
+  <preview>PersPreview_view</preview>
+  <entity>Pers_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>901b3b2b-0f39-4d21-89fc-7d3cc7f6f5bc</name>
+      <view>PersMain_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>44ddbcaa-f5ae-4cf7-a12c-36e0c4fe854d</name>
+      <view>PersFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>aa2fef1f-796c-4d00-b37c-0d91e55957a0</name>
+      <view>PersPreview_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
--- a/neonFrame/TASK_DATE_Neon/children/neonregister/tabs/todoappointment/children/dfo_appointment/onActionProcess.js
+++ b/neonFrame/TASK_DATE_Neon/children/neonregister/tabs/todoappointment/children/dfo_appointment/onActionProcess.js
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+import("system.text");
+
+if(vars.exists("$sys.selectionRows"))
+{
+    var uid = JSON.parse(vars.get("$sys.selectionRows"))[0].UID;
+    uid = text.decodeMS(uid)[0];
+    
+    neon.openCalendarEntryByUID(calendars.VEVENT, null, uid, "", neon.OPERATINGSTATE_VIEW, null);
+}
--- a/neonFrame/TASK_DATE_Neon/children/neonregister/tabs/todoappointment/children/dfo_todo/onActionProcess.js
+++ b/neonFrame/TASK_DATE_Neon/children/neonregister/tabs/todoappointment/children/dfo_todo/onActionProcess.js
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+import("system.text");
+
+if(vars.exists("$sys.selectionRows"))
+{
+    var uid = JSON.parse(vars.get("$sys.selectionRows"))[0].UID;
+    uid = text.decodeMS(uid)[0];
+
+    neon.openCalendarEntryByUID(calendars.VTODO, null, uid, "", neon.OPERATINGSTATE_VIEW, null);
+}
\ No newline at end of file
--- a/neonFrame/TASK_DATE_Neon/icon.png
+++ b/neonFrame/TASK_DATE_Neon/icon.png