diff --git a/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js b/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js index 2004dbd1cf970659a1d350fda68c4115067eec71..51c40eed05ba103ae4347347277aea4e2bad20a3 100644 --- a/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js +++ b/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js @@ -1,4 +1,4 @@ import("system.vars"); import("system.result"); -result.object(["Offer", "Contract", "Campaign", "Order"]); \ No newline at end of file +result.object(["Offer", "Contract", "Campaign", "Order", "SupportTicket"]); \ No newline at end of file diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js index 80de2ad6f59ea933c2d7ea90a37806950ecde558..af182d86ab01f75543a9cb21ba7a69e81f56050d 100644 --- a/process/Context_lib/process.js +++ b/process/Context_lib/process.js @@ -8,6 +8,7 @@ import("Keyword_lib"); import("Sql_lib"); import("Proto_lib"); import("Contact_lib"); +import("KeywordRegistry_basic"); /** * Methods to manage contexts. @@ -370,7 +371,7 @@ ContextUtils.getSelectMap = function() .setJoinExpression("join CONTACT on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID and CONTACT.PERSON_ID is null") .setCondition(SqlCondition.begin().and("ORGANISATION.ORGANISATIONID != '0'")) .setSubContexts({ - "Person": ["select CONTACTID from CONTACT where PERSON_ID is not null and", "CONTACT.ORGANISATION_ID", '', ["Offer", "Order", "Contract"]] + "Person": ["select CONTACTID from CONTACT where PERSON_ID is not null and", "CONTACT.ORGANISATION_ID", '', ["Offer", "Order", "Contract", "SupportTicket"]] }) ,"Person": ContextSelector.create("CONTACT", "CONTACTID") .setTitleExpression(maskingUtils.concat([ @@ -445,7 +446,13 @@ ContextUtils.getSelectMap = function() .setStateField("CAMPAIGN.STATE") .setActiveStates(["e04c9c59-0590-463c-a10e-e25c583e9cf2", "42e1ee2b-0108-4ccf-ab43-29cbcb0377bf"]) ,"CampaignStep" : ContextSelector.create("CAMPAIGNSTEP", "CAMPAIGNSTEPID", "NAME") - + ,"SupportTicket": ContextSelector.create("TICKET", "TICKETID", "TASK.SUBJECT") + .setJoinExpression("left join TASK on TASK.TASKID = TICKET.TASK_ID") + .setCondition(SqlCondition.begin().andPrepare("TICKET.TICKETTYPE", $KeywordRegistry.ticketType$supportTicket())) + .setContactIdField("TASK.REQUESTOR_CONTACT_ID") + .setStateField("TASK.STATUS") + .setActiveStates([$KeywordRegistry.taskStatus$new(), $KeywordRegistry.taskStatus$inProcess()]) + .setCreationDateField("TASK.START_DATE") } } @@ -511,6 +518,7 @@ ContextUtils.getContextDataSql = function(pContextId, pContactId, pWithDate, pAc var cond = SqlCondition.begin(); if (pContactId) { + logging.log(JSON.stringify(ownContextSelector, null, "\t")) cond.andPrepare(ownContextSelector.getFullField(ownContextSelector.contactIdField), pContactId) }