diff --git a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js index be441660fd77db7c09105087ecaab6dcc49dde54..c22aa1e7ac5e4f967e326f54c7814cba7ba30960 100644 --- a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js +++ b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js @@ -35,7 +35,7 @@ function _get360Data(pContactId, pContextList) for(var i = 0; i < pContextList.length; i++) { var res = ContextUtils.getContextDataSqlviaReadEntity(pContextList[i], pContactId); - res.data.forEach(function (row) + res.forEach(function (row) { var targetid = row["#UID"]; var title = row["#CONTENTTITLE"]; @@ -52,7 +52,7 @@ function _get360Data(pContactId, pContextList) description, // DESCRIPTION dataDate, // DATE dataDate, // YEAR - res.entity, // ENTITY_NAME + ContextUtils.getEntity(pContextList[i]),// ENTITY_NAME translate.text(group) // GROUP ]); }); diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod index f33a33912223de0d1e2047b7f1de11979c36c939..69194f215d026b72ab22c772270b99db2c3396ab 100644 --- a/entity/Salesproject_entity/Salesproject_entity.aod +++ b/entity/Salesproject_entity/Salesproject_entity.aod @@ -751,6 +751,9 @@ <title>Classification</title> <groupable v="true" /> </entityField> + <entityField> + <name>DATE_NEW</name> + </entityField> </entityFields> <recordContainers> <dbRecordContainer> @@ -902,6 +905,10 @@ <recordfield>CLASSIFICATIONSTORAGE.CLASSIFICATIONVALUE</recordfield> <isFilterable v="true" /> </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>DATE_NEW.value</name> + <recordfield>SALESPROJECT.STARTDATE</recordfield> + </dbRecordFieldMapping> </recordFieldMappings> <filterExtensions> <filterExtensionSet> diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js index 20a9fcc3657b5996ee9522e40511fc3a36f57c61..589b16695a64aeee079db9c0abd486162f904d61 100644 --- a/process/Context_lib/process.js +++ b/process/Context_lib/process.js @@ -717,10 +717,7 @@ ContextUtils.getContextDataSqlviaReadEntity = function(pContextId, pContactId) throw new Error(translate.text("Some prereserved EntityFields which are necessary fot 360° are not available. Context: "+pContextId +" Data: "+JSON.stringify(res))); } - return { - "entity":ContextUtils.getEntity(pContextId), - "data": res - }; + return res; } /**