Skip to content
Snippets Groups Projects
Commit 999ff414 authored by Tobias Feldmann's avatar Tobias Feldmann
Browse files

360 degree extensions

parent b112d771
No related branches found
No related tags found
No related merge requests found
......@@ -60,6 +60,11 @@
<groupable v="true" />
<valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/context_name/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE</name>
<title>Date</title>
<contentType>DATE</contentType>
</entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
......@@ -71,6 +76,7 @@
<element>TARGET_ID.value</element>
<element>TARGET_CONTEXT.value</element>
<element>TITLE.value</element>
<element>DATE.value</element>
</recordFields>
</jDitoRecordContainer>
</recordContainers>
......
......@@ -15,10 +15,11 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
data.forEach(function (row)
{
var record = [];
record[0] = util.getNewUUID();
record[1] = row[0];
record[2] = context;
record[3] = row[1];
record[0] = util.getNewUUID(); // UID
record[1] = row[0]; // TARGET_ID
record[2] = context; // TARGET_CONTEXT
record[3] = row[1]; // TITLE
record[4] = row[2]; //DATE
resultList.push(record);
});
......
......@@ -12,7 +12,7 @@
<treetableViewTemplate>
<name>Treetable</name>
<titleField>TITLE</titleField>
<descriptionField>CONTEXT_NAME</descriptionField>
<descriptionField>DATE</descriptionField>
<defaultGroupFields>
<element>CONTEXT_NAME</element>
</defaultGroupFields>
......
......@@ -108,12 +108,13 @@ ContextUtils._getSelectMap = function()
{
var maskingUtils = new SqlMaskingUtils();
return {
// contextId nameField Tablename (or from-part inc, joins), IDField, RelationField, override Tablename (needed if Tablename is a join clause)
// contextId nameField Tablename (or from-part inc, joins), IDField, RelationField, CreationDate override Tablename (needed if Tablename is a join clause)
// "Appointment": ["SUMMARY", "ASYS_CALENDARBACKEND", "UID"]
"Organisation": [
"\"NAME\"",
"ORGANISATION",
"ORGANISATIONID",
"",
""
],
"Person": [
......@@ -121,12 +122,14 @@ ContextUtils._getSelectMap = function()
"PERSON join CONTACT on PERSON.PERSONID = CONTACT.PERSON_ID join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID ",
"CONTACTID",
"",
"CONTACT"
"CONTACT",
""
],
"Activity": [
"SUBJECT",
"ACTIVITY",
"ACTIVITYID",
"",
""
],
"Salesproject": [
......@@ -139,7 +142,9 @@ ContextUtils._getSelectMap = function()
], "", false),
"SALESPROJECT",
"SALESPROJECTID",
"CONTACT_ID"],
"CONTACT_ID",
"STARTDATE"
],
"Contract": [
maskingUtils.concat([
KeywordUtils.getResolvedTitleSqlPart("ContractType", "CONTRACTTYPE"),
......@@ -147,7 +152,8 @@ ContextUtils._getSelectMap = function()
], " "),
"CONTRACT",
"CONTRACTID",
"CONTACT_ID"
"CONTACT_ID",
"CONTRACTSTART"
],
"Offer": [
maskingUtils.concat([
......@@ -159,7 +165,9 @@ ContextUtils._getSelectMap = function()
], "", false),
"OFFER",
"OFFERID",
"CONTACT_ID"],
"CONTACT_ID",
"OFFERDATE"
],
"Order": [
maskingUtils.concat([
"'" + translate.text("Order") + "'",
......@@ -170,7 +178,8 @@ ContextUtils._getSelectMap = function()
], "", false),
"SALESORDER",
"SALESORDERID",
"CONTACT_ID"
"CONTACT_ID",
"ORDERDATE"
],
"Product": [
maskingUtils.concat([
......@@ -180,6 +189,7 @@ ContextUtils._getSelectMap = function()
], "", false),
"PRODUCT",
"PRODUCTID",
"",
""
],
"Task": [
......@@ -187,6 +197,7 @@ ContextUtils._getSelectMap = function()
"TASK",
"TASKID",
translate.text("Task"),
"",
""
]
}
......@@ -243,7 +254,7 @@ ContextUtils.getContextDataSql = function(pContextId, pRowId)
{
cond.andPrepare(selectMap[pContextId][1] + "." + selectMap[pContextId][3], pRowId)
}
return cond.buildSql("select " + selectMap[pContextId][2] + ", " + selectMap[pContextId][0] + " from " + selectMap[pContextId][1], "1=1");
return cond.buildSql("select " + selectMap[pContextId][2] + ", " + selectMap[pContextId][0] + ", " + selectMap[pContextId][4] + " from " + selectMap[pContextId][1], "1=1");
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment