diff --git a/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js b/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js index 48efd9fecbbd7b0c6e7b15e44e1269dc2eb976a4..844708f89dc0cc824e7651eade24917d5a38e4fb 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 c47e48d2310d87c55d94dc8b4a9632fca4bc4fb4..4e420da40299a338582d21fb1974cb19ca6cc29e 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 72d7fc725df6d67b5d6a30d236fb0b87094d287f..8fd3d347cac2df60651d46bdab6fb9caffbd7ca6 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 2e9ed00405539d833d2543e06e97da035aa94eba..26ca463bb4a9c341995c2e1f8fbee561ea0295a2 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>