From cffed996df902f88cd96f8a78a2dc0d6c92b2ec6 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Thu, 4 Apr 2019 10:01:12 +0200
Subject: [PATCH] =?UTF-8?q?loggings=20raus=20und=20=C3=9Cbersetzungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../objectid/displayValueProcess.js           | 13 +++--
 entity/Appointment_entity/afterUiInit.js      | 43 ++++++++-------
 .../entityfields/summary/valueProcess.js      | 54 ++++++++++++-------
 entity/Offer_entity/Offer_entity.aod          |  2 +-
 4 files changed, 64 insertions(+), 48 deletions(-)

diff --git a/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js b/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js
index 48efd9fecb..844708f89d 100644
--- a/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js
+++ b/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js
@@ -1,8 +1,7 @@
-import("system.logging");
-import("system.db");
-import("system.vars");
-import("system.result");
-import("Context_lib")
-
-logging.log("name??")
+import("system.logging");
+import("system.db");
+import("system.vars");
+import("system.result");
+import("Context_lib")
+
 result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECTTYPE"), vars.get("$field.OBJECTID"))));
\ No newline at end of file
diff --git a/entity/Appointment_entity/afterUiInit.js b/entity/Appointment_entity/afterUiInit.js
index c47e48d231..4e420da402 100644
--- a/entity/Appointment_entity/afterUiInit.js
+++ b/entity/Appointment_entity/afterUiInit.js
@@ -1,23 +1,22 @@
-import("system.util");
-import("system.neon");
-import("system.logging");
-import("system.vars");
-
-
-
-
-if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
-{
-    var entry = JSON.parse(vars.getString("$param.Entry_param"));
-   
-    if(entry["AppLinkContext"] && entry["AppLinkId"])
-    {
-        logging.log("hier geht lohos... " + vars.get("$field.UID") + " id");
-        neon.addRecord(null, "AppointmentLinks",
-        {
-            "AB_APPOINTMENTLINKID" : util.getNewUUID(),
-            "OBJECTID" : entry["AppLinkId"],
-            "OBJECTTYPE" : entry["AppLinkContext"]
-        });
-    }
+import("system.util");
+import("system.neon");
+import("system.logging");
+import("system.vars");
+
+
+
+
+if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
+{
+    var entry = JSON.parse(vars.getString("$param.Entry_param"));
+   
+    if(entry["AppLinkContext"] && entry["AppLinkId"])
+    {
+        neon.addRecord(null, "AppointmentLinks",
+        {
+            "AB_APPOINTMENTLINKID" : util.getNewUUID(),
+            "OBJECTID" : entry["AppLinkId"],
+            "OBJECTTYPE" : entry["AppLinkContext"]
+        });
+    }
 }
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/summary/valueProcess.js b/entity/Appointment_entity/entityfields/summary/valueProcess.js
index 72d7fc725d..8fd3d347ca 100644
--- a/entity/Appointment_entity/entityfields/summary/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/summary/valueProcess.js
@@ -1,18 +1,36 @@
-import("system.logging");
-import("system.neon");
-import("system.vars");
-import("system.calendars");
-import("system.result");
-
-/**
- * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
- */
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
-{
-    logging.log()
-    
-    var event = JSON.parse(vars.getString("$param.Entry_param"));
-
-    if(event[calendars.SUMMARY])
-        result.string(event[calendars.SUMMARY]);
-}
\ No newline at end of file
+import("system.logging");
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+import("system.result");
+
+/**
+ * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
+ */
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+{
+    logging.log()
+    
+    var event = JSON.parse(vars.getString("$param.Entry_param"));
+
+    if(event[calendars.SUMMARY])
+        result.string(event[calendars.SUMMARY]);
+}
+
+
+
+//if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+//{
+//    var uiVal = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.SUMMARY"));
+//    var paramVal = JSON.parse(vars.getString("$param.Entry_param"))[calendars.SUMMARY];
+//    
+//    logging.log("os: " + vars.get("$sys.operatingstate"));
+//    logging.log("rs: " + vars.get("$sys.recordstate"));
+//    logging.log("paramVal: " + paramVal);
+//    logging.log("uiVal: " + uiVal);
+//    
+//    if(uiVal === paramVal || !uiVal)
+//        result.string(paramVal);
+//    else if(uiVal && !uiVal.equals(paramVal))
+//        result.string(uiVal);
+//}
\ No newline at end of file
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 2e9ed00405..26ca463bb4 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -37,7 +37,7 @@
     </entityField>
     <entityField>
       <name>OFFERDATE</name>
-      <title>Creation date</title>
+      <title>Date</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
       <outputFormat>dd.MM.yyyy</outputFormat>
-- 
GitLab