diff --git a/entity/History_entity/History_entity.aod b/entity/History_entity/History_entity.aod index c45d521b201685b1bf9bb429ed6e59967adab6e4..c9307c27b6b1b8f9b5356c7eede13dbde3dc7705 100644 --- a/entity/History_entity/History_entity.aod +++ b/entity/History_entity/History_entity.aod @@ -101,6 +101,10 @@ <columnName>DATE_NEW</columnName> <valueProcess>%aditoprj%/entity/History_entity/entityfields/date_new/valueProcess.js</valueProcess> </entityField> + <entityField> + <name>SUBJECT_DETAILS</name> + <valueProcess>%aditoprj%/entity/History_entity/entityfields/subject_details/valueProcess.js</valueProcess> + </entityField> </entityFields> <linkInformation> <linkInformation> diff --git a/entity/History_entity/entityfields/subject_details/valueProcess.js b/entity/History_entity/entityfields/subject_details/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..38ab42f56ebb0e7d47b577ac4d8032f82ebfcf10 --- /dev/null +++ b/entity/History_entity/entityfields/subject_details/valueProcess.js @@ -0,0 +1,7 @@ +import("system.vars"); +import("system.result"); +import("Keyword_lib"); + +var kwdUtils; +kwdUtils = new KeywordUtils(); +result.string(vars.get("$field.SUBJECT") + " (" + kwdUtils.getViewValue("HISTORY.DIRECTION", vars.get("$field.DIRECTION")) + " - " + kwdUtils.getViewValue("HISTORY.MEDIUM", vars.get("$field.MEDIUM")) + ")"); \ No newline at end of file diff --git a/neonContext/History_context/History_context.aod b/neonContext/History_context/History_context.aod index 9b5b5e184241c18f884e57fe331df74c83b8dfbf..b9ed80eeabe5d74bf8e31b59dcce86f933bb28ba 100644 --- a/neonContext/History_context/History_context.aod +++ b/neonContext/History_context/History_context.aod @@ -20,5 +20,9 @@ <name>9b432ee5-c767-4c47-ad2a-66d2163557d1</name> <view>HistoryEdit_view</view> </neonViewReference> + <neonViewReference> + <name>e0af0a30-934b-4063-a4cf-9ba0c848a4db</name> + <view>HistoryTimeline_view</view> + </neonViewReference> </references> </neonContext> diff --git a/neonView/HistoryTimeline_view/HistoryTimeline_view.aod b/neonView/HistoryTimeline_view/HistoryTimeline_view.aod new file mode 100644 index 0000000000000000000000000000000000000000..cae320aa44c1a054a1c7dd89d31a924059f53e67 --- /dev/null +++ b/neonView/HistoryTimeline_view/HistoryTimeline_view.aod @@ -0,0 +1,19 @@ +<?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.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0"> + <name>HistoryTimeline_view</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <boxLayout> + <name>layout</name> + </boxLayout> + </layout> + <children> + <timelineViewTemplate> + <name>Timeline_template</name> + <dateField>ENTRYDATE</dateField> + <titleField>SUBJECT_DETAILS</titleField> + <descriptionField>INFO</descriptionField> + <entityField>#ENTITY</entityField> + </timelineViewTemplate> + </children> +</neonView> diff --git a/neonView/OrgMain_view/OrgMain_view.aod b/neonView/OrgMain_view/OrgMain_view.aod index edb4bb4693ef97734f73efa8ada4fe2fc86b9acc..f8eb7903461c5bea00bd049251cc99a8df0f81ff 100644 --- a/neonView/OrgMain_view/OrgMain_view.aod +++ b/neonView/OrgMain_view/OrgMain_view.aod @@ -18,7 +18,7 @@ <neonViewReference> <name>14bb5a70-fec1-4346-a8c2-2dde6fb32822</name> <entityField>OrgHistory_dfo</entityField> - <view>HistoryFilter_view</view> + <view>HistoryTimeline_view</view> </neonViewReference> <neonViewReference> <name>3a211f9c-48b5-4568-b3d4-5f413eb56253</name> diff --git a/neonView/PersMain_view/PersMain_view.aod b/neonView/PersMain_view/PersMain_view.aod index 5f77bdaab1821fb500a21fa9c0a13b65fe54691b..85a233a6bc7c731efb0059048ff7a5c8a8c6c0f2 100644 --- a/neonView/PersMain_view/PersMain_view.aod +++ b/neonView/PersMain_view/PersMain_view.aod @@ -17,7 +17,7 @@ <neonViewReference> <name>d674b32c-0493-47ea-a51f-dff5d13d237d</name> <entityField>PersHistory_dfo</entityField> - <view>HistoryFilter_view</view> + <view>HistoryTimeline_view</view> </neonViewReference> </children> </neonView> diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js index 777a9c9c4ac04f87c39e8975304a197e36780454..e65c8d64e2c85aefaa5b469d00d54494ed515cfa 100644 --- a/process/Keyword_lib/process.js +++ b/process/Keyword_lib/process.js @@ -2,6 +2,15 @@ import("system.logging"); import("system.translate"); function KeywordUtils(){ + + this.getViewValue = function(keywordType, key){ + var keyword = this.getStandardArray(keywordType); + for(var i = 0; i < keyword.length; i++) + if(keyword[i][0] == key) + return keyword[i][1]; + return ""; + } + this.getStandardArray = function(keywordType){ return this.createKeyword(keywordType).toArray(); }