From b4856ea4522010ecf6919a31768de78eecbeefc1 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 27 May 2019 15:35:19 +0200
Subject: [PATCH] refactor display values
---
entity/Offer_entity/Offer_entity.aod | 1 +
.../OfferFilter_view/OfferFilter_view.aod | 182 +++++++++---------
.../OrderFilter_view/OrderFilter_view.aod | 174 ++++++++---------
3 files changed, 175 insertions(+), 182 deletions(-)
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 079612be85..02c532652e 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -54,6 +54,7 @@
<name>PROBABILITY</name>
<title>Probability</title>
<consumer>KeywordProbabilities</consumer>
+ <contentType>NUMBER</contentType>
<displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
diff --git a/neonView/OfferFilter_view/OfferFilter_view.aod b/neonView/OfferFilter_view/OfferFilter_view.aod
index ce15ecfc7a..233e57008b 100644
--- a/neonView/OfferFilter_view/OfferFilter_view.aod
+++ b/neonView/OfferFilter_view/OfferFilter_view.aod
@@ -1,93 +1,89 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>OfferFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <dashletConfigurations>
- <neonDashletConfiguration>
- <name>AllOffersDashlet</name>
- <title>Offers</title>
- <description>Show all offers</description>
- <fragment>Offer/filter</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>vaadin:cart</icon>
- <categories>
- <neonDashletCategory>
- <name>sales</name>
- <title>Sales</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>offer</name>
- <title>Offer</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- <neonDashletConfiguration>
- <name>SendOffersDashlet</name>
- <title>Sent offers</title>
- <description>Show all sent offers</description>
- <fragment>Offer/filter?search=W3sibmFtZSI6IlNUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZSI6ImU1ZDZiNWE0LTc1NzYtNDQwZi04MzMyLWJjNDAxNDdjMDMzNSIsImNvbnRlbnRUeXBlIjoiVEVYVCJ9XQ%253D%253D</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>vaadin:cart</icon>
- <categories>
- <neonDashletCategory>
- <name>sales</name>
- <title>Sales</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>offer</name>
- <title>Offer</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- </dashletConfigurations>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Offers</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>5755c4a7-0ec4-4ba8-9fa8-a64c440042f8</name>
- <entityField>IMAGE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>4d40cee3-bcb1-4e67-8c1d-d5fc2e49cc11</name>
- <entityField>FullOfferCode</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>780087e7-ff3c-4592-90be-607357168295</name>
- <entityField>CONTACT_ID</entityField>
- <width v="75" />
- <expandRatio v="100" />
- </neonTableColumn>
- <neonTableColumn>
- <name>c5780864-ac2c-4650-8630-2690a9a074ea</name>
- <entityField>STATUS</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>443c8480-5676-43a3-9617-f86dae39c960</name>
- <entityField>OFFERDATE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>6f55da1e-281c-44ba-ab97-729b75516c32</name>
- <entityField>NET</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>a0e5fc8f-ce4f-4a79-902d-27f3e3ad2a3d</name>
- <entityField>CURRENCY</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>24440d2f-cb7a-4a5f-9d54-b1cd130908c8</name>
- <entityField>PROBABILITY</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>OfferFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>AllOffersDashlet</name>
+ <title>Offers</title>
+ <description>Show all offers</description>
+ <fragment>Offer/filter</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>vaadin:cart</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>sales</name>
+ <title>Sales</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>offer</name>
+ <title>Offer</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ <neonDashletConfiguration>
+ <name>SendOffersDashlet</name>
+ <title>Sent offers</title>
+ <description>Show all sent offers</description>
+ <fragment>Offer/filter?search=W3sibmFtZSI6IlNUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZSI6ImU1ZDZiNWE0LTc1NzYtNDQwZi04MzMyLWJjNDAxNDdjMDMzNSIsImNvbnRlbnRUeXBlIjoiVEVYVCJ9XQ%253D%253D</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>vaadin:cart</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>sales</name>
+ <title>Sales</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>offer</name>
+ <title>Offer</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Offers</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>5755c4a7-0ec4-4ba8-9fa8-a64c440042f8</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>4d40cee3-bcb1-4e67-8c1d-d5fc2e49cc11</name>
+ <entityField>FullOfferCode</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>780087e7-ff3c-4592-90be-607357168295</name>
+ <entityField>CONTACT_ID</entityField>
+ <width v="75" />
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>c5780864-ac2c-4650-8630-2690a9a074ea</name>
+ <entityField>STATUS</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>443c8480-5676-43a3-9617-f86dae39c960</name>
+ <entityField>OFFERDATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>6f55da1e-281c-44ba-ab97-729b75516c32</name>
+ <entityField>NET</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>24440d2f-cb7a-4a5f-9d54-b1cd130908c8</name>
+ <entityField>PROBABILITY</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod
index 4ab1486bce..de08917e72 100644
--- a/neonView/OrderFilter_view/OrderFilter_view.aod
+++ b/neonView/OrderFilter_view/OrderFilter_view.aod
@@ -1,89 +1,85 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>OrderFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <dashletConfigurations>
- <neonDashletConfiguration>
- <name>AllOrdersDashlet</name>
- <title>Receipts</title>
- <description>Show all receipts</description>
- <fragment>Order/filter</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>VAADIN:FILE_TEXT_O</icon>
- <categories>
- <neonDashletCategory>
- <name>sales</name>
- <title>Sales</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>order</name>
- <title>Receipt</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- <neonDashletConfiguration>
- <name>SendOrdersDashlet</name>
- <title>Sent receipts</title>
- <description>Show all sent receipts</description>
- <fragment>Order/filter?search=W3sibmFtZSI6IlNUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZUtleSI6IjIiLCJ2YWx1ZSI6IlZlcnNlbmRldCIsImNvbnRlbnRUeXBlIjoiVEVYVCJ9XQ%253D%253D</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>VAADIN:FILE_TEXT_O</icon>
- <categories>
- <neonDashletCategory>
- <name>sales</name>
- <title>Sales</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>order</name>
- <title>Receipt</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- </dashletConfigurations>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Orders</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>8d4948c3-40cb-45dd-ae04-32ae06458b26</name>
- <entityField>IMAGE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>60b83daa-9349-4bef-94d8-5f1fc350da59</name>
- <entityField>SALESORDERCODE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>5688908f-7c50-46a3-8899-2767ea5b4a90</name>
- <entityField>CONTACT_ID</entityField>
- <width v="75" />
- <expandRatio v="100" />
- </neonTableColumn>
- <neonTableColumn>
- <name>443c8480-5676-43a3-9617-f86dae39c960</name>
- <entityField>SALESORDERDATE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>c5780864-ac2c-4650-8630-2690a9a074ea</name>
- <entityField>STATUS</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>6f55da1e-281c-44ba-ab97-729b75516c32</name>
- <entityField>NET</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>a0e5fc8f-ce4f-4a79-902d-27f3e3ad2a3d</name>
- <entityField>CURRENCY</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>OrderFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>AllOrdersDashlet</name>
+ <title>Receipts</title>
+ <description>Show all receipts</description>
+ <fragment>Order/filter</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>VAADIN:FILE_TEXT_O</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>sales</name>
+ <title>Sales</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>order</name>
+ <title>Receipt</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ <neonDashletConfiguration>
+ <name>SendOrdersDashlet</name>
+ <title>Sent receipts</title>
+ <description>Show all sent receipts</description>
+ <fragment>Order/filter?search=W3sibmFtZSI6IlNUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZUtleSI6IjIiLCJ2YWx1ZSI6IlZlcnNlbmRldCIsImNvbnRlbnRUeXBlIjoiVEVYVCJ9XQ%253D%253D</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>VAADIN:FILE_TEXT_O</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>sales</name>
+ <title>Sales</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>order</name>
+ <title>Receipt</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Orders</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>8d4948c3-40cb-45dd-ae04-32ae06458b26</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>60b83daa-9349-4bef-94d8-5f1fc350da59</name>
+ <entityField>SALESORDERCODE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>5688908f-7c50-46a3-8899-2767ea5b4a90</name>
+ <entityField>CONTACT_ID</entityField>
+ <width v="75" />
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>443c8480-5676-43a3-9617-f86dae39c960</name>
+ <entityField>SALESORDERDATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>c5780864-ac2c-4650-8630-2690a9a074ea</name>
+ <entityField>STATUS</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>6f55da1e-281c-44ba-ab97-729b75516c32</name>
+ <entityField>NET</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
--
GitLab