Skip to content
Snippets Groups Projects
Commit 6488c87d authored by Andre Loreth's avatar Andre Loreth
Browse files

Merge branch 'master' of gitlab.adito.de:xrm/basic into Fix_1035784 

# Conflicts:
#	entity/Document_entity/Document_entity.aod
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
parents 391d6811 9301c5ff
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 287 additions and 88 deletions
aliasDefinition/Data_alias/Data_alias.aod
+ 56
− 56
View file @ 6488c87d
......@@ -94,8 +94,8 @@
<name>STRENGTH</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -108,8 +108,8 @@
<name>WEAKNESS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -122,8 +122,8 @@
<name>PRICE_POLITICS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -491,8 +491,8 @@
<name>ADDR_TYPE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="5" />
<size v="5" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -673,8 +673,8 @@
<name>MEDIUM_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -1109,7 +1109,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="true" />
<index v="false" />
<title></title>
<description></description>
<dependencies>
......@@ -1142,7 +1142,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="true" />
<index v="false" />
<title></title>
<description></description>
<dependencies>
......@@ -1695,8 +1695,8 @@
<name>PROBABILITY</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -1904,7 +1904,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="true" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
......@@ -2088,8 +2088,8 @@
<name>PHASE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -2167,8 +2167,8 @@
<name>STATE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -2444,20 +2444,6 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>INFO</name>
<dbName></dbName>
......@@ -2523,8 +2509,8 @@
<name>STATUS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -2621,8 +2607,8 @@
<name>PHASE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -3019,8 +3005,8 @@
<name>CATEGORY</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -3300,6 +3286,20 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>OFFER_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
......@@ -3384,7 +3384,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="true" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
......@@ -3552,8 +3552,8 @@
<name>PRIORITY</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="5" />
<size v="5" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -3833,20 +3833,6 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>RELATION_TYPE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
......@@ -4198,6 +4184,20 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>MEMO_VALUE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
......
entity/Activity_entity/Activity_entity.aod
+ 6
− 1
View file @ 6488c87d
......@@ -21,7 +21,6 @@
<resolution>DAY</resolution>
<outputFormat>dd.MM.yyyy</outputFormat>
<mandatory v="true" />
<groupable v="true" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrydate/valueProcess.js</valueProcess>
</entityField>
<entityField>
......@@ -329,6 +328,12 @@
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>ENTRYDAY</name>
<title>Entrydate (Day)</title>
<groupable v="true" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entryday/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/Activity_entity/entityfields/entrydate/valueProcess.js
+ 3
− 2
View file @ 6488c87d
import("system.datetime");
import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.getString("$sys.date"));
\ No newline at end of file
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.getString("$this.value"))
result.string(datetime.date());
\ No newline at end of file
entity/Activity_entity/entityfields/entryday/valueProcess.js 0 → 100644
+ 6
− 0
View file @ 6488c87d
import("system.datetime");
import("system.result");
import("system.vars");
var entryDate = vars.get("$field.ENTRYDATE");
result.string(datetime.toDate(entryDate, "dd MMMM yyyy"));
\ No newline at end of file
entity/Appointment_entity/Appointment_entity.aod
+ 8
− 0
View file @ 6488c87d
......@@ -17,13 +17,16 @@
<entityField>
<name>CLASSIFICATION</name>
<possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>BEGIN</name>
<selectionMode>SINGLE</selectionMode>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/begin/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>END</name>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/end/valueProcess.js</valueProcess>
</entityField>
<entityFieldGroup>
<name>STARTEND</name>
......@@ -43,9 +46,11 @@
</entityField>
<entityField>
<name>REMINDER_CHECK</name>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder_check/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>REMINDER</name>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>CATEGORIES</name>
......@@ -57,6 +62,7 @@
</entityField>
<entityField>
<name>TRANSPARENCY</name>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/transparency/valueProcess.js</valueProcess>
</entityField>
<entityActionGroup>
<name>PartStatActionGroup</name>
......@@ -100,9 +106,11 @@
</entityField>
<entityField>
<name>RRULE</name>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/rrule/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>RECURRENCEID</name>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/recurrenceid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>SAFESCOPEFIELD</name>
......
entity/Appointment_entity/entityfields/begin/valueProcess.js 0 → 100644
+ 15
− 0
View file @ 6488c87d
import("system.neon");
import("system.vars");
import("system.calendars");
import("system.result");
/**
* Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
*/
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
{
var event = JSON.parse(vars.getString("$param.Entry_param"));
if(event[calendars.DTSTART])
result.string(event[calendars.DTSTART]);
}
\ No newline at end of file
entity/Appointment_entity/entityfields/classification/valueProcess.js 0 → 100644
+ 15
− 0
View file @ 6488c87d
import("system.neon");
import("system.vars");
import("system.calendars");
import("system.result");
/**
* Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
*/
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
{
var event = JSON.parse(vars.getString("$param.Entry_param"));
if(event[calendars.CLASSIFICATION])
result.string(event[calendars.CLASSIFICATION]);
}
\ No newline at end of file
entity/Appointment_entity/entityfields/end/valueProcess.js 0 → 100644
+ 15
− 0
View file @ 6488c87d
import("system.neon");
import("system.vars");
import("system.calendars");
import("system.result");
/**
* Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
*/
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
{
var event = JSON.parse(vars.getString("$param.Entry_param"));
if(event[calendars.DTEND])
result.string(event[calendars.DTEND]);
}
\ No newline at end of file
entity/Appointment_entity/entityfields/recurrenceid/valueProcess.js 0 → 100644
+ 12
− 0
View file @ 6488c87d
import("system.neon");
import("system.vars");
import("system.calendars");
import("system.result");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
{
var event = JSON.parse(vars.getString("$param.Entry_param"));
if(event[calendars.RECURRENCEID])
result.string(event[calendars.RECURRENCEID]);
}
\ No newline at end of file
entity/Appointment_entity/entityfields/reminder/valueProcess.js 0 → 100644
+ 15
− 0
View file @ 6488c87d
import("system.neon");
import("system.vars");
import("system.calendars");
import("system.result");
/**
* Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
*/
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
{
var event = JSON.parse(vars.getString("$param.Entry_param"));
if(event[calendars.REMINDER_DURATION])
result.string(event[calendars.REMINDER_DURATION]);
}
\ No newline at end of file
entity/Appointment_entity/entityfields/reminder_check/valueProcess.js 0 → 100644
+ 15
− 0
View file @ 6488c87d
import("system.neon");
import("system.vars");
import("system.calendars");
import("system.result");
/**
* Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
*/
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
{
var event = JSON.parse(vars.getString("$param.Entry_param"));
if(event[calendars.HASREMINDER])
result.string(event[calendars.HASREMINDER]);
}
\ No newline at end of file
entity/Appointment_entity/entityfields/rrule/valueProcess.js 0 → 100644
+ 12
− 0
View file @ 6488c87d
import("system.neon");
import("system.vars");
import("system.calendars");
import("system.result");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
{
var event = JSON.parse(vars.getString("$param.Entry_param"));
if(event[calendars.RRULE])
result.string(event[calendars.RRULE]);
}
\ No newline at end of file
entity/Appointment_entity/entityfields/summary/valueProcess.js
+ 15
− 1
View file @ 6488c87d
import("system.neon");
import("system.vars");
import("system.calendars");
import("system.result");
/**
* Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
*/
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
{
var event = JSON.parse(vars.getString("$param.Entry_param"));
if(event[calendars.SUMMARY])
result.string(event[calendars.SUMMARY]);
}
\ No newline at end of file
entity/Appointment_entity/entityfields/transparency/valueProcess.js 0 → 100644
+ 15
− 0
View file @ 6488c87d
import("system.neon");
import("system.vars");
import("system.calendars");
import("system.result");
/**
* Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
*/
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
{
var event = JSON.parse(vars.getString("$param.Entry_param"));
if(event[calendars.TRANSPARENCY])
result.string(event[calendars.TRANSPARENCY]);
}
\ No newline at end of file
entity/AttributeRelation_entity/AttributeRelation_entity.aod
+ 55
− 1
View file @ 6488c87d
......@@ -16,9 +16,10 @@
<entityField>
<name>AB_ATTRIBUTE_ID</name>
<title>Attribute</title>
<consumer>SpecificAttribute</consumer>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attribute_id/possibleItemsProcess.js</possibleItemsProcess>
<groupable v="true" />
<displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js</onValueChange>
</entityField>
<entityField>
......@@ -69,6 +70,24 @@
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>21de4424-d5e2-4c19-a5e1-1f59dbc186b3</name>
<entityName>Contract_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>5bcda86a-e56c-4a4a-ac13-c6eb68152200</name>
<entityName>Product_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>a9b81050-e7f8-408d-aa73-e2709188e121</name>
<entityName>SalesprojectCompetition_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
......@@ -134,6 +153,37 @@
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>MEMO_VALUE</name>
</entityField>
<entityParameter>
<name>filteredAttributeIds_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
<name>SpecificAttribute</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Attribute_entity</entityName>
<fieldName>SpecificAttribute</fieldName>
</dependency>
<children>
<entityParameter>
<name>objectType_param</name>
<code>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/objecttype_param/code.js</code>
<expose v="true" />
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>filteredAttributeIds_param</name>
<code>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/code.js</code>
<expose v="true" />
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -198,6 +248,10 @@
<name>ATTRIBUTE_PARENT_ID.value</name>
<recordfield>AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>MEMO_VALUE.value</name>
<recordfield>AB_ATTRIBUTERELATION.MEMO_VALUE</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/AttributeRelation_entity/entityfields/ab_attribute_id/possibleItemsProcess.js → entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js
+ 5
− 0
View file @ 6488c87d
import("system.vars");
import("system.result");
import("Attribute_lib");
result.object(AttributeUtil.getPossibleAttributes(vars.get("$param.objectType_param")));
result.string(AttributeUtil.getFullAttributeName(vars.get("$field.AB_ATTRIBUTE_ID")));
\ No newline at end of file
entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
+ 1
− 0
View file @ 6488c87d
......@@ -8,4 +8,5 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT ||
neon.setFieldValue("$field.DATE_VALUE", null);
neon.setFieldValue("$field.ID_VALUE", null);
neon.setFieldValue("$field.NUMBER_VALUE", null);
neon.setFieldValue("$field.MEMO_VALUE", null);
}
\ No newline at end of file
entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js
+ 10
− 27
View file @ 6488c87d
......@@ -3,36 +3,19 @@ import("system.result");
import("system.vars");
import("Attribute_lib");
"$field.CHAR_VALUE";
"$field.DATE_VALUE";
"$field.NUMBER_VALUE";
"$field.BOOL_VALUE";
"$field.ID_VALUE";
"$field.MEMO_VALUE";
if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
{
var attrType = AttributeHandler.begin(vars.get("$field.AB_ATTRIBUTE_ID")).getAttributeField();
var attrField = AttributeHandler.begin(vars.get("$field.AB_ATTRIBUTE_ID")).getAttributeField();
var value = null;
if (attrType != null) //load the value from the correct field for the type
{
switch (attrType)
{
case $AttributeTypes.TEXT.toString():
value = vars.get("$field.CHAR_VALUE");
break;
case $AttributeTypes.DATE.toString():
value = vars.get("$field.DATE_VALUE");
break;
case $AttributeTypes.NUMBER.toString():
value = vars.get("$field.NUMBER_VALUE");
break;
case $AttributeTypes.BOOLEAN.toString():
value = vars.get("$field.BOOL_VALUE");
break;
case $AttributeTypes.COMBO.toString():
case $AttributeTypes.KEYWORD.toString():
value = vars.get("$field.ID_VALUE");
break;
}
}
//var attrField = AttributeHandler.begin(vars.get("$field.AB_ATTRIBUTE_ID")).getAttributeField();
//var value = null;
//if (attrField != null) //load the value from the correct field for the type
// value = vars.get("$field." + attrField);
if (attrField != null) //load the value from the correct field for the type
value = vars.get("$field." + attrField);
if(value != null && value != "")
result.string(value);
......
entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/code.js 0 → 100644
+ 4
− 0
View file @ 6488c87d
import("system.vars");
import("system.result");
result.string(vars.exists("$param.filteredAttributeIds_param") ? vars.get("$param.filteredAttributeIds_param") : "");
\ No newline at end of file
entity/AttributeRelation_entity/entityfields/specificattribute/children/objecttype_param/code.js 0 → 100644
+ 4
− 0
View file @ 6488c87d
import("system.vars");
import("system.result");
result.string(vars.exists("$param.objectType_param") ? vars.get("$param.objectType_param") : "");
\ 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