diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod index a6b28c020c5bee4e6dfa2a6629bbe45a34c14f48..e1b6705179f6b711836d57167c0e81a1e6461f5b 100644 --- a/entity/Order_entity/Order_entity.aod +++ b/entity/Order_entity/Order_entity.aod @@ -952,6 +952,10 @@ <iconId>VAADIN:CURLY_BRACKETS</iconId> <stateProcess>%aditoprj%/entity/Order_entity/entityfields/openadminview/stateProcess.js</stateProcess> </entityActionField> + <entityField> + <name>REMINDER_REPORT_DATA</name> + <valueProcess>%aditoprj%/entity/Order_entity/entityfields/reminder_report_data/valueProcess.js</valueProcess> + </entityField> <entityConsumer> <name>Organisations</name> <dependency> diff --git a/entity/Order_entity/entityfields/reminder_report_data/valueProcess.js b/entity/Order_entity/entityfields/reminder_report_data/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..35c5e637a934a35956135dae57c170ff4a1b4074 --- /dev/null +++ b/entity/Order_entity/entityfields/reminder_report_data/valueProcess.js @@ -0,0 +1,9 @@ +import("system.result"); +import("system.vars"); +import("Order_lib"); + +var reportData = OrderUtils.buildReminderReport(vars.get("$field.SALESORDERID")); + +if(reportData != null) { + result.string(reportData[1]); +} \ No newline at end of file diff --git a/neonView/OrderReminderReport_view/OrderReminderReport_view.aod b/neonView/OrderReminderReport_view/OrderReminderReport_view.aod new file mode 100644 index 0000000000000000000000000000000000000000..71398a6c8da974489f53d9a48c2ae58dc85856b9 --- /dev/null +++ b/neonView/OrderReminderReport_view/OrderReminderReport_view.aod @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.4"> + <name>OrderReminderReport_view</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <boxLayout> + <name>layout</name> + </boxLayout> + </layout> + <children> + <reportViewTemplate> + <name>Report</name> + <reportData>REMINDER_REPORT_DATA</reportData> + <entityField>#ENTITY</entityField> + </reportViewTemplate> + </children> +</neonView> diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js index b4ef3fa6d02ee66e7cd947cfb33db0afaa335cc5..fda69211f4c12a6a5c1b6d2223dc32272adc803f 100644 --- a/process/Order_lib/process.js +++ b/process/Order_lib/process.js @@ -371,9 +371,14 @@ OrderUtils.openOrderReport = function (pOrderID) orderReport.openReport(); } - -OrderUtils.openReminderReport = function (pOrderID) -{ +/** + * Will build the reminder report for the given order. + * + * @param {String} pOrderID The ID of the order, for which the report shall be built. + * @return {Array} [filename, data] + */ +OrderUtils.buildReminderReport = function (pOrderID) +{ var reminderReport = new Report("Reminder_report"); var sqlUtil = new SqlMaskingUtils(); @@ -443,7 +448,7 @@ OrderUtils.openReminderReport = function (pOrderID) if (itemData.length == 0) - return; + return null; var fullPrice = 0; var itemSum = 0; @@ -543,7 +548,17 @@ OrderUtils.openReminderReport = function (pOrderID) ]) .add(itemData)); - reminderReport.openReport(); + return reminderReport.exportReport(); +} + +/** + * Opens the reminder report for the given order. + * + * @param {String} pOrderID The ID of the order, for which the report shall be built. + */ +OrderUtils.openReminderReport = function (pOrderID) +{ + neon.openContext("Order", "OrderReminderReport_view", [pOrderID], neon.OPERATINGSTATE_VIEW, null); }