[Projekt: Entwicklung - Neon][TicketNr.: 1022526][Bereitstellung erste Version...

[Projekt: Entwicklung - Neon][TicketNr.: 1022526][Bereitstellung erste Version 5.1 Customizing für Gremium]
provided an alternative for keywords till they are implemented fully; cleared languages; set correct captions 

neonContext/Address_context/Address_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>Address_context</name>
-  <title>Adressen</title>
+  <title>Addresses</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterview>AddressFilter_view</filterview>
   <editview>AddressEdit_view</editview>

neonContext/Comm_context/Comm_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>Comm_context</name>
-  <title>Kommunikation</title>
+  <title>Communication</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <entity>Comm_entity</entity>
   <references>

neonView/AddressEdit_view/AddressEdit_view.aod

@@ -17,6 +17,10 @@
           <name>b510378e-dfd3-4cec-bc2e-84b72aebb2b6</name>
           <entityField>ADDR_TYPE</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>d8a7a16b-9d7f-44d7-bbb1-b0404d5b8b8f</name>
+          <entityField>COUNTRY</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>c70668f3-6722-4a90-86d6-0d89be06dbe1</name>
           <entityField>ADDRESS</entityField>
@@ -33,10 +37,6 @@
           <name>fafca9d6-c6dd-4b66-b1ff-1d6ba451827b</name>
           <entityField>CITY</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>d8a7a16b-9d7f-44d7-bbb1-b0404d5b8b8f</name>
-          <entityField>COUNTRY</entityField>
-        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>

neonView/AddressList_view/AddressList_view.aod

@@ -16,6 +16,10 @@
           <name>49e14587-34f7-4f09-916c-9eb4aaf55509</name>
           <entityField>ADDR_TYPE</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>dfaa01a1-0b11-4f92-aa18-89f12ebb2db5</name>
+          <entityField>COUNTRY</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>4e5e6a4f-f43e-4861-a912-fb05e576f960</name>
           <entityField>ADDRESS</entityField>

process/Keyword_lib/Keyword_lib.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.1.7">
+  <name>Keyword_lib</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/Keyword_lib/process.js</process>
+</process>

process/Keyword_lib/process.js

+import("system.logging");
+import("system.translate");
+
+function KeywordUtils(){
+    this.getStandardArray = function(keywordType){
+        return this.createKeyword(keywordType).toArray();
+    }
+    
+    this.createKeyword = function(keywordType){
+        var valueContainer, _toArrayFn;
+
+        switch (keywordType){
+            case "RELATION.STATUS":
+                valueContainer = createKeywordEntriesContainer([
+                     createKeywordEntry("0", translate.text("Inactive"))
+                    ,createKeywordEntry("1", translate.text("Active"))
+                    ,createKeywordEntry("2", translate.text("In review"))
+                ]);
+                break;
+            case "COUNTRY":
+                valueContainer = createKeywordEntriesContainer([
+                     createKeywordEntry("DE", translate.text("Germany"))
+                    ,createKeywordEntry("AT", translate.text("Austria"))
+                    ,createKeywordEntry("CH", translate.text("Switzerland"))
+                    ,createKeywordEntry("GB", translate.text("United Kingdom"))
+                    ,createKeywordEntry("NO", translate.text("Norway"))
+                ]);
+                break;
+            case "LANGUAGE":
+                valueContainer = createKeywordEntriesContainer([
+                     createKeywordEntry("de", translate.text("German"))
+                    ,createKeywordEntry("de-DE", translate.text("German (Germany)"))
+                    ,createKeywordEntry("de-AT", translate.text("German (Austria)"))
+                    ,createKeywordEntry("en", translate.text("English"))
+                    ,createKeywordEntry("en-UK", translate.text("English (United Kingdom)"))
+                    ,createKeywordEntry("no-NO", translate.text("Norwegian"))
+                ]);
+                break;
+            case "HISTORY.DIRECTION":
+                valueContainer = createKeywordEntriesContainer([
+                     createKeywordEntry("i", translate.text("Incoming"))
+                    ,createKeywordEntry("o", translate.text("Outgoing"))
+                ]);
+                break;
+            case "HISTORY.MEDIUM":
+                valueContainer = createKeywordEntriesContainer([
+                     createKeywordEntry("0", translate.text("Visit"))
+                    ,createKeywordEntry("1", translate.text("E-Mail"))
+                    ,createKeywordEntry("2", translate.text("Phone"))
+                    ,createKeywordEntry("3", translate.text("Internal"))
+                    ,createKeywordEntry("4", translate.text("Online-Meeting"))
+                ]);
+            case "COMM.MEDIUM":
+                valueContainer = createKeywordEntriesContainer([
+                     createKeywordEntry("0", translate.text("Mobile"))
+                    ,createKeywordEntry("1", translate.text("E-Mail"))
+                    ,createKeywordEntry("2", translate.text("Phone"))
+                    ,createKeywordEntry("3", translate.text("Internet"))
+                ]);
+                break;
+            case "ADDRESS.TYPE":
+                valueContainer = createKeywordEntriesContainer([
+                     createKeywordEntry("1", translate.text("Office address"))
+                    ,createKeywordEntry("2", translate.text("Home address"))
+                    ,createKeywordEntry("3", translate.text("Delivery address"))
+                    ,createKeywordEntry("4", translate.text("Post office box"))
+                ]);
+                break;
+            case "ORG.TYPE":
+                valueContainer = createKeywordEntriesContainer([
+                     createKeywordEntry("0", translate.text("Customer"))
+                    ,createKeywordEntry("1", translate.text("Prospect"))
+                    ,createKeywordEntry("2", translate.text("Supplier"))
+                    ,createKeywordEntry("3", translate.text("Other"))
+                ]);
+                break;
+            case "PERS.GENDER":
+                valueContainer = createKeywordEntriesContainer([
+                     createKeywordEntry("f", translate.text("Female"))
+                    ,createKeywordEntry("m", translate.text("Male"))
+                    ,createKeywordEntry("o", translate.text("${GENDER_OTHER}"))
+                ]);
+                break;
+            default: 
+                throw new Error(translate.withArguments("[%0]the given keyword \"%1\" has no match with the possible keywordlist", [
+                    arguments.callee.name, keywordType
+                ]));
+                break;
+        }
+
+        _toArrayFn = function(fields){
+            var res, id, i, l, currentRow, currentField;
+
+            res = [];
+            if (!fields)
+                fields = ["id", "name"];
+            l = fields.length;
+            for (id in valueContainer){
+                currentRow = [];
+                for (i = 0; i < l; i++){
+                    currentField = fields[i];
+                    //check if the passed fieldnames match the existing fieldnames (<=> properties in the object)
+                    //to prevent errors and unexpected behaviour
+                    if (valueContainer[id][currentField])
+                        currentRow.push(valueContainer[id][currentField]);
+                    else
+                        currentRow.push("");
+                }
+                res.push(currentRow);
+            }
+            return res;
+        }
+
+        return {
+            /*
+             *test
+             **/
+            "toArray": _toArrayFn
+        }
+    }
+    
+    
+    function createKeywordEntry(id, name, description){
+        //TODO: verify if mandatory-checks are really that usefull or can at least be made easier
+        if (!id)
+            throw new Error(translate.withArguments("the param \"%0\" in \"%1\" is mandatory and has to be set", [
+                "id", arguments.callee.name
+            ]));
+        if (!name)
+            throw new Error(translate.withArguments("the param \"%0\" in \"%1\" is mandatory and has to be set", [
+                "name", arguments.callee.name
+            ]));
+
+        return {
+             id: id
+            ,name: name
+            ,description: description || ""
+        }
+    }
+
+    function createKeywordEntriesContainer(keywordEntries){
+        var res, i, l, id;
+
+        res = {};
+        for (i = 0, l = keywordEntries.length; i < l; i++){
+            id = keywordEntries[i].id;
+            if (res[id] != undefined){
+                throw new Error("the given id is not unique since it already exists");
+            }
+            res[id] = keywordEntries[i];
+        }
+        return res;
+    }
+}
\ No newline at end of file

process/Sql_lib/process.js

@@ -634,7 +634,7 @@ function SqlUtils()
     * @param {String} pColumn req Column name
     * @param {String} pAlias opt Database alias
     * @param {Boolean} pWithTime opt if true, then add time hh:mm:ss
-    * @param {String} pFormat opt type of the format, e.g. dd.MM.yyyy; possible placeholers are: -dd -MM -yyyy
+    * @param {String} pFormat opt type of the format, e.g. yyyy-MM-dd; possible placeholers are: -dd -MM -yyyy
     *
     *@return {String} sqlstr, fully functional select for sql for different types of databases
     */
@@ -646,7 +646,7 @@ function SqlUtils()
         var pDatabaseType = db.getDatabaseType(pAlias);
         
         if (pFormat == undefined)
-            pFormat = translate.text("dd.MM.yyyy");
+            pFormat = translate.text("yyyy-MM-dd");
         
         var str = "";
         

process/Util_lib/process.js

@@ -195,8 +195,8 @@ function StringUtils()
     */
     this.label_new_edit = function(pDateNew, pUserNew, pDateEdit, pUserEdit)
     {
-        var retst = translate.withArguments("erstellt %0 von %1", [ datetime.toDate(pDateNew, translate.text("dd.MM.yyyy")), pUserNew]);
-        if (pDateEdit != undefined && pDateEdit != "")  retst += " | " + translate.withArguments("geändert %0 von %1", [ datetime.toDate(pDateEdit, translate.text("dd.MM.yyyy")), pUserEdit]);
+        var retst = translate.withArguments("created on %0 by %1", [ datetime.toDate(pDateNew, translate.text("yyyy-MM-dd")), pUserNew]);
+        if (pDateEdit != undefined && pDateEdit != "")  retst += " | " + translate.withArguments("changed on %0 by %1", [ datetime.toDate(pDateEdit, translate.text("yyyy-MM-dd")), pUserEdit]);
         return(retst)
     }