Skip to content
Snippets Groups Projects
Commit bb632011 authored by Maximilian Hofmann's avatar Maximilian Hofmann
Browse files

merged master into DSGVO

parents e482264b 5a6f0a9a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 180 additions and 171 deletions
application/_____SYSTEM_CALENDAR_RIBBON_NEON/_____SYSTEM_CALENDAR_RIBBON_NEON.aod
+ 12
− 12
View file @ bb632011
<?xml version="1.0" encoding="UTF-8"?>
<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
<name>_____SYSTEM_CALENDAR_RIBBON_NEON</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<entityNode name="_____SYSTEM_COMPANY" kind="200" />
<neonCalendarRibbon>
<name>neonCalendarRibbon</name>
<entity>
<name>entity</name>
</entity>
</neonCalendarRibbon>
</application>
<?xml version="1.0" encoding="UTF-8"?>
<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
<name>_____SYSTEM_CALENDAR_RIBBON_NEON</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<entityNode name="_____SYSTEM_COMPANY" kind="200" />
<neonCalendarRibbon>
<name>neonCalendarRibbon</name>
<entity>
<name>entity</name>
</entity>
</neonCalendarRibbon>
</application>
application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod
+ 14
− 14
View file @ bb632011
<?xml version="1.0" encoding="UTF-8"?>
<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
<name>_____SYSTEM_INDEXSEARCH_RIBBON</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<entityNode name="_____SYSTEM_COMPANY" kind="200" />
<indexSearchRibbon>
<name>indexSearchRibbon</name>
<ribbonTasks>
<ribbonTask>
<name>TASK_INDEXSEARCH</name>
</ribbonTask>
</ribbonTasks>
</indexSearchRibbon>
</application>
<?xml version="1.0" encoding="UTF-8"?>
<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
<name>_____SYSTEM_INDEXSEARCH_RIBBON</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<entityNode name="_____SYSTEM_COMPANY" kind="200" />
<indexSearchRibbon>
<name>indexSearchRibbon</name>
<ribbonTasks>
<ribbonTask>
<name>TASK_INDEXSEARCH</name>
</ribbonTask>
</ribbonTasks>
</indexSearchRibbon>
</application>
application/_____SYSTEM_INDEXSEARCH_RIBBON_NEON/_____SYSTEM_INDEXSEARCH_RIBBON_NEON.aod
+ 9
− 9
View file @ bb632011
<?xml version="1.0" encoding="UTF-8"?>
<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
<name>_____SYSTEM_INDEXSEARCH_RIBBON_NEON</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<entityNode name="_____SYSTEM_COMPANY" kind="200" />
<neonIndexSearchRibbon>
<name>neonIndexSearchRibbon</name>
</neonIndexSearchRibbon>
</application>
<?xml version="1.0" encoding="UTF-8"?>
<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
<name>_____SYSTEM_INDEXSEARCH_RIBBON_NEON</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<entityNode name="_____SYSTEM_COMPANY" kind="200" />
<neonIndexSearchRibbon>
<name>neonIndexSearchRibbon</name>
</neonIndexSearchRibbon>
</application>
entity/Activity_entity/Activity_entity.aod
+ 13
− 1
View file @ bb632011
......@@ -5,7 +5,7 @@
<documentation>%aditoprj%/entity/Activity_entity/documentation.adoc</documentation>
<title>Activity</title>
<afterUiInit>%aditoprj%/entity/Activity_entity/afterUiInit.js</afterUiInit>
<iconId>NEON:HISTORY</iconId>
<iconId>NEON:ACTIVITY</iconId>
<image>VAADIN:SHOP</image>
<imageProcess>%aditoprj%/entity/Activity_entity/imageProcess.js</imageProcess>
<titlePlural>Activities</titlePlural>
......@@ -230,6 +230,18 @@
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>9b416661-628d-4f8d-b8dc-9543cf5bbb1c</name>
<entityName>Campaign_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>4869a849-8717-48ec-9dbd-73df96992042</name>
<entityName>CampaignStep_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
......
entity/Activity_entity/entityfields/newmail/onActionProcess.js 0 → 100644
+ 15
− 0
View file @ bb632011
import("system.logging");
import("system.db");
import("system.vars");
import("system.neon");
import("KeywordRegistry_basic");
var params = {
"DocumentTemplateType_param" : $KeywordRegistry.documentTemplateType$mail()
}
//neon.openContext("DocumentTemplate", "DocumentTemplateFilterSmall_view", null, neon.OPERATINGSTATE_SEARCH, params);
//neon.openContext("DocumentTemplate", "DocumentTemplateFilterSmall_view", null, null, null, params);
neon.openContext("DocumentTemplate", null, null, neon.OPERATINGSTATE_SEARCH, params);
entity/Address_entity/Address_entity.aod
+ 2
− 1
View file @ bb632011
......@@ -3,8 +3,9 @@
<name>Address_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Address_entity/documentation.adoc</documentation>
<title>Addresses</title>
<title>Address</title>
<contentTitleProcess>%aditoprj%/entity/Address_entity/contentTitleProcess.js</contentTitleProcess>
<titlePlural>Addresses</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityField>
......
entity/Analyses_entity/entityfields/imminent_appointments/valueProcess.js
+ 1
− 1
View file @ bb632011
......@@ -52,4 +52,4 @@ entries = calendars.getEntries(conditions);
logging.log("entries: " + entries.toSource());
result.string(entries.length);
\ No newline at end of file
result.string(entries.length);
entity/Analyses_entity/entityfields/new_tasks/valueProcess.js
+ 1
− 1
View file @ bb632011
......@@ -8,4 +8,4 @@ import("system.SQLTYPES")
var opentask = db.cell("select count(STATUS) from TASK join AB_KEYWORD_ENTRY on KEYID = STATUS and CONTAINER = 'TaskStatus' and TITLE = 'new' group by KEYID, AB_KEYWORD_ENTRY.TITLE");
result.string(opentask);
\ No newline at end of file
result.string(opentask);
entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js
+ 0
− 2
View file @ bb632011
......@@ -11,5 +11,3 @@ var overduetask = db.cell(SqlCondition.begin()
.buildSql("select count(TASKID) from TASK", "1=2"));
result.string(overduetask);
entity/Appointment_entity/afterUiInit.js
+ 1
− 1
View file @ bb632011
......@@ -12,7 +12,7 @@ if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
if(entry["AppLinkContext"] && entry["AppLinkId"])
{
neon.addRecord(null, "AppointmentLinks",
neon.addRecord("AppointmentLinks",
{
"AB_APPOINTMENTLINKID" : util.getNewUUID(),
"OBJECTID" : entry["AppLinkId"],
......
entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
+ 87
− 87
View file @ bb632011
import("system.result");
import("system.vars");
import("system.calendars");
import("system.datetime");
import("system.eMath");
import("system.util");
import("system.neon");
if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
{
var entry = JSON.parse(vars.getString("$param.Entry_param"));
var masterEntry = null;
if (vars.exists("$param.MasterEntry_param") && vars.get("$param.MasterEntry_param") != "") {
masterEntry = JSON.parse(vars.get("$param.MasterEntry_param"));
}
var uid = entry[calendars.ID];
var summary = entry[calendars.SUMMARY];
var attendees = entry[calendars.AFFECTEDUSERS];
var startdate = entry[calendars.DTSTART];
var enddate = entry[calendars.DTEND];
var links = entry[calendars.LINKS];
var description = entry[calendars.DESCRIPTION];
if(entry[calendars.ORGANIZER2] != undefined)
var organizer = entry[calendars.ORGANIZER2]["paramvalue"];
var status = entry[calendars.STATUS];
var location = entry[calendars.LOCATION];
var reminder = entry[calendars.REMINDER_DURATION];
var remindercheck = entry[calendars.HASREMINDER]
var classification = entry[calendars.CLASSIFICATION];
var transparency = entry[calendars.TRANSPARENCY];
var categories = entry[calendars.CATEGORIES];
var masterBegin = masterEntry != null ? masterEntry[calendars.DTSTART] : null
var masterEnd = masterEntry != null ? masterEntry[calendars.DTEND] : null
// Recurrence
var recurrenceID = entry[calendars.RECURRENCEID];
var rrule = null;
if (masterEntry != null) { // Entry is a recurrence exception, therefore get rrule from master
rrule = masterEntry[calendars.RRULE] != null ? masterEntry[calendars.RRULE][0] : null;
} else {
rrule = entry[calendars.RRULE] != null ? entry[calendars.RRULE][0] : null;
}
// if(entry["AppLinkContext"] && entry["AppLinkId"])
// {
// logging.log("hier geht lohos... " + uid + " id");
// neon.addRecord(null, "AppointmentLinks",
// {
// "AB_APPOINTMENTLINKID" : util.getNewUUID(),
// "APPOINTMENT_ID" : vars.get("$field.UID"),
// "OBJECTID" : entry["AppLinkId"],
// "OBJECTTYPE" : entry["AppLinkContext"]
// });
// }
//@TODO Icon
result.object([
[
uid,
attendees.length,
startdate,
enddate,
summary,
organizer,
attendees,
status,
links,
description,
location,
'',
classification,
transparency,
categories,
reminder,
remindercheck,
rrule,
recurrenceID,
null,
masterBegin,
masterEnd
]
]);
}
import("system.result");
import("system.vars");
import("system.calendars");
import("system.datetime");
import("system.eMath");
import("system.util");
import("system.neon");
if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
{
var entry = JSON.parse(vars.getString("$param.Entry_param"));
var masterEntry = null;
if (vars.exists("$param.MasterEntry_param") && vars.get("$param.MasterEntry_param") != "") {
masterEntry = JSON.parse(vars.get("$param.MasterEntry_param"));
}
var uid = entry[calendars.ID];
var summary = entry[calendars.SUMMARY];
var attendees = entry[calendars.AFFECTEDUSERS];
var startdate = entry[calendars.DTSTART];
var enddate = entry[calendars.DTEND];
var links = entry[calendars.LINKS];
var description = entry[calendars.DESCRIPTION];
if(entry[calendars.ORGANIZER2] != undefined)
var organizer = entry[calendars.ORGANIZER2]["paramvalue"];
var status = entry[calendars.STATUS];
var location = entry[calendars.LOCATION];
var reminder = entry[calendars.REMINDER_DURATION];
var remindercheck = entry[calendars.HASREMINDER]
var classification = entry[calendars.CLASSIFICATION];
var transparency = entry[calendars.TRANSPARENCY];
var categories = entry[calendars.CATEGORIES];
var masterBegin = masterEntry != null ? masterEntry[calendars.DTSTART] : null
var masterEnd = masterEntry != null ? masterEntry[calendars.DTEND] : null
// Recurrence
var recurrenceID = entry[calendars.RECURRENCEID];
var rrule = null;
if (masterEntry != null) { // Entry is a recurrence exception, therefore get rrule from master
rrule = masterEntry[calendars.RRULE] != null ? masterEntry[calendars.RRULE][0] : null;
} else {
rrule = entry[calendars.RRULE] != null ? entry[calendars.RRULE][0] : null;
}
// if(entry["AppLinkContext"] && entry["AppLinkId"])
// {
// logging.log("hier geht lohos... " + uid + " id");
// neon.addRecord("AppointmentLinks",
// {
// "AB_APPOINTMENTLINKID" : util.getNewUUID(),
// "APPOINTMENT_ID" : vars.get("$field.UID"),
// "OBJECTID" : entry["AppLinkId"],
// "OBJECTTYPE" : entry["AppLinkContext"]
// });
// }
//@TODO Icon
result.object([
[
uid,
attendees.length,
startdate,
enddate,
summary,
organizer,
attendees,
status,
links,
description,
location,
'',
classification,
transparency,
categories,
reminder,
remindercheck,
rrule,
recurrenceID,
null,
masterBegin,
masterEnd
]
]);
}
entity/AttributeRelation_entity/AttributeRelation_entity.aod
+ 0
− 6
View file @ bb632011
......@@ -53,12 +53,6 @@
<fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>d6d5f9aa-4582-4ec5-9381-394a38a726e8</name>
<entityName>Offer_entity</entityName>
<fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>b728166d-a74f-4ca1-8ce7-7e57032f2a7d</name>
<entityName>Contract_entity</entityName>
......
entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js
+ 1
− 1
View file @ bb632011
......@@ -9,5 +9,5 @@ if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
"ObjectType_param" : vars.get("$param.ObjectType_param"),
"ObjectRowId_param" : vars.get("$param.ObjectRowId_param")
};
neon.openContext("AttributeRelationTree", "AttributeRelationTreeEdit_view", [selectedRows[0]], neon.OPERATINGSTATE_EDIT, params);
neon.openContext("AttributeRelation", "AttributeRelationTreeEdit_view", [selectedRows[0]], neon.OPERATINGSTATE_EDIT, params);
}
\ No newline at end of file
entity/Employee_entity/afterOperatingState.js → entity/AttributeRelation_entity/entityfields/uid/valueProcess.js
+ 7
− 0
View file @ bb632011
import("system.vars");
import("system.result");
import("system.neon");
import("system.vars");
import("system.util");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
neon.setFieldValue("$field.UID", ""); //UID = user-title, should be initially empty
\ No newline at end of file
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(util.getNewUUID());
\ No newline at end of file
entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
+ 3
− 31
View file @ bb632011
import("Util_lib");
import("system.vars");
import("system.result");
import("system.db");
......@@ -56,7 +57,7 @@ var defaultFields = [
var valueFields = AttributeTypeUtil.getAllDatabaseFields();
var attributeSql = attrCond.buildSql("select " + defaultFields.join(", ") + ", " + valueFields.join(", ")
+ " from AB_ATTRIBUTERELATION join AB_ATTRIBUTE on AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID"
+ " left join AB_ATTRIBUTE COMBOVAL on " + $AttributeTypes.COMBO.databaseField + " = COMBOVAL.AB_ATTRIBUTEID");
+ " left join AB_ATTRIBUTE COMBOVAL on " + $AttributeTypes.COMBO.databaseField + " = COMBOVAL.AB_ATTRIBUTEID", "1=2");
var attributeNameMap = {};
var attributeValues = db.table(attributeSql).map(function (row)
......@@ -81,7 +82,7 @@ var attributeValues = db.table(attributeSql).map(function (row)
if (getTree)
_fetchAttributes(attributeValues.map(function (row) {return row[1]}));
allAttributes = _sortArrayForTree(allAttributes).concat(attributeValues);
allAttributes = TreeUtils.sortArrayForTree(allAttributes, 0, 1).concat(attributeValues);
result.object(allAttributes);
......@@ -106,33 +107,4 @@ function _fetchAttributes (pAttributeIds)
}, attributeObj);
if (nextIds.length)
_fetchAttributes(nextIds);
}
function _sortArrayForTree (pArray)
{
if (pArray.length <= 1)
return pArray;
var rows = {};
var allIds = {};
var idIndex = 0;
var parentIdIndex = 1;
pArray.forEach(function (row) {allIds[row[idIndex]] = true;});
var index = 0;
do {
var oldIndex = index;
pArray.forEach(function (row)
{
if (!(row[idIndex] in this) && (row[parentIdIndex] in this || !allIds[row[parentIdIndex]]))
this[row[idIndex]] = {
data : row,
index : index++
};
}, rows);
} while (oldIndex != index);
var sortedArray = new Array(index);
for (let i in rows)
sortedArray[rows[i].index] = rows[i].data;
return sortedArray;
}
\ No newline at end of file
entity/AttributeUsage_entity/entityfields/context/children/exclusivecontexts_param/valueProcess.js
+ 3
− 1
View file @ bb632011
......@@ -9,5 +9,7 @@ result.object([
"Offer",
"Order",
"Employee",
"Salesproject"
"Salesproject",
"Campaign",
"DocumentTemplate"
]);
\ No newline at end of file
entity/Attribute_entity/Attribute_entity.aod
+ 2
− 1
View file @ bb632011
......@@ -181,7 +181,7 @@
<dependencies>
<entityDependency>
<name>ba3b4d47-7385-49df-bf61-54c99f5b2c81</name>
<entityName>AttributeRelationTree_entity</entityName>
<entityName>AttributeRelation_entity</entityName>
<fieldName>SpecificAttribute</fieldName>
<isConsumer v="false" />
</entityDependency>
......@@ -297,6 +297,7 @@
</entityConsumer>
<entityField>
<name>ICON</name>
<colorProcess>%aditoprj%/entity/Attribute_entity/entityfields/icon/colorProcess.js</colorProcess>
<contentType>IMAGE</contentType>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
......
entity/Attribute_entity/afterUiInit.js
+ 1
− 1
View file @ bb632011
......@@ -20,7 +20,7 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
//preset the usages with the ones from the parent
usages.forEach(function (usage)
{
neon.addRecord(null, "AttributeUsages", {
neon.addRecord("AttributeUsages", {
"OBJECT_TYPE" : usage
});
});
......
entity/Attribute_entity/entityfields/icon/colorProcess.js 0 → 100644
+ 6
− 0
View file @ bb632011
import("system.vars");
import("system.result");
import("system.neon");
if (vars.getString("$field.ATTRIBUTE_ACTIVE") != "1")
result.string(neon.PRIORITY_LOW_COLOR);
\ No newline at end of file
entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
+ 2
− 1
View file @ bb632011
import("system.logging");
import("Sql_lib");
import("system.db");
import("system.vars");
......@@ -20,4 +21,4 @@ var values = [
];
db.updateData("AB_ATTRIBUTE", columns, null, values,
SqlCondition.equals("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.UID", "1=2"));
\ No newline at end of file
SqlCondition.equals("AB_ATTRIBUTE.AB_ATTRIBUTEID", vars.get("$field.UID"), "1=2"));
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment