diff --git a/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js b/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js index e25db6b1024be40f497efdb97d94f7ff2ba0f925..cee26913021aaca4b49d84e0a50eca912e8a2799 100644 --- a/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js +++ b/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js @@ -101,6 +101,9 @@ function _addMonth(pYear, pMonth, pData, pCategory) function _addProducts(pYear, pMonth, pData, pCategory) { + var monthDate = new Date(pYear, pMonth-1); + monthDate = datetime.toDate(monthDate.getTime(), "MMM yyyy", "UTC"); + var groupcodeSums = {}; for (let i = 0; i < pData.length; i++) @@ -131,6 +134,8 @@ function _addProducts(pYear, pMonth, pData, pCategory) for (let groupcode in groupcodeSums) { if (groupcodeSums[groupcode]["sum"]) - chartData.add(pCategory + pYear + pMonth + groupcode, pCategory + pYear + pMonth, [pCategory, groupcodeSums[groupcode]["name"], groupcodeSums[groupcode]["sum"]]); + { + chartData.add(pCategory + pYear + pMonth + groupcode, pCategory + pYear + pMonth, [pCategory, groupcodeSums[groupcode]["name"] + " (" + monthDate.toString() + ")", groupcodeSums[groupcode]["sum"]]); + } } } diff --git a/neonContext/Offer/Offer.aod b/neonContext/Offer/Offer.aod index e1d68da5ca5cac83a93742e7ee2cdd8e82dbede4..ff88eb5a2d7980c3abf9393624b544b07a813d0d 100644 --- a/neonContext/Offer/Offer.aod +++ b/neonContext/Offer/Offer.aod @@ -28,7 +28,7 @@ </neonViewReference> <neonViewReference> <name>a68c9d63-aff4-4e82-af23-72d20c2b6b76</name> - <view>OfferDetail_view</view> + <view>OfferCoverLetter_view</view> </neonViewReference> </references> </neonContext> diff --git a/neonView/OfferDetail_view/OfferDetail_view.aod b/neonView/OfferCoverLetter_view/OfferCoverLetter_view.aod similarity index 68% rename from neonView/OfferDetail_view/OfferDetail_view.aod rename to neonView/OfferCoverLetter_view/OfferCoverLetter_view.aod index a465d174bc221a0fa4ada807e8f2cb3aa9d104d3..3eb7add5eefa24bba18d5cee1d847b29ddb3118a 100644 --- a/neonView/OfferDetail_view/OfferDetail_view.aod +++ b/neonView/OfferCoverLetter_view/OfferCoverLetter_view.aod @@ -1,7 +1,7 @@ <?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>OfferDetail_view</name> - <title>Details</title> + <name>OfferCoverLetter_view</name> + <title>Cover letter</title> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> <boxLayout> @@ -12,18 +12,10 @@ <genericViewTemplate> <name>Details</name> <showDrawer v="true" /> - <drawerCaption>Detail</drawerCaption> + <drawerCaption>Cover letter</drawerCaption> <entityField>#ENTITY</entityField> <title></title> <fields> - <entityFieldLink> - <name>f0d0c68a-8437-4d9e-b852-575efaa984e8</name> - <entityField>DELIVERYTERMS</entityField> - </entityFieldLink> - <entityFieldLink> - <name>c66f5e5b-82ad-4f93-9951-d96dfb802dbe</name> - <entityField>PAYMENTTERMS</entityField> - </entityFieldLink> <entityFieldLink> <name>ab742325-7d03-4dfd-8afb-779dd8da805b</name> <entityField>INFO</entityField> diff --git a/neonView/OfferMain_view/OfferMain_view.aod b/neonView/OfferMain_view/OfferMain_view.aod index fd194c1b379bf81e5201f48d3f4bf360ff3fb234..ea4a89a44810d450579b611e28b0e28cf923ff86 100644 --- a/neonView/OfferMain_view/OfferMain_view.aod +++ b/neonView/OfferMain_view/OfferMain_view.aod @@ -22,7 +22,7 @@ <neonViewReference> <name>e6b12eed-d67e-467c-9302-f6340f901235</name> <entityField>#ENTITY</entityField> - <view>OfferDetail_view</view> + <view>OfferCoverLetter_view</view> </neonViewReference> <neonViewReference> <name>a3702740-418d-40d5-9415-788542c14abb</name> diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod index 5a36edbfc7aa6617c5da3e4dffde6d27c92f7ffd..5ebc5733ab8f4abba5d853538e634828874a9593 100644 --- a/neonView/OfferPreview_view/OfferPreview_view.aod +++ b/neonView/OfferPreview_view/OfferPreview_view.aod @@ -82,6 +82,14 @@ <name>3317b73e-68e8-41a8-a678-89c7c7c8513e</name> <entityField>SALESPROJECT_ID</entityField> </entityFieldLink> + <entityFieldLink> + <name>59daee43-0e79-49d8-a36a-5ce4c491def9</name> + <entityField>PAYMENTTERMS</entityField> + </entityFieldLink> + <entityFieldLink> + <name>a3a9ee30-bdd2-4907-b215-d4b4adcc0f1d</name> + <entityField>DELIVERYTERMS</entityField> + </entityFieldLink> </fields> </genericViewTemplate> <neonViewReference>