Skip to content
Snippets Groups Projects
Commit 84bbd00e authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

Merge branch 'ActivityThemes' into 'master' 

Activity themes

See merge request xrm/basic!58
parents 57e9a05d 06b06bdf
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 638 additions and 420 deletions
entity/Activity_entity/Activity_entity.aod
+ 44
− 0
View file @ 84bbd00e
......@@ -487,6 +487,50 @@
<name>Subject_param</name>
<expose v="true" />
</entityParameter>
<entityConsumer>
<name>ActivityAtrributes</name>
<dependency>
<name>dependency</name>
<entityName>Attribute_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/activityatrributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>AttributeTypes_param</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/activityatrributes/children/attributetypes_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>ObjectRowId_param</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/activityatrributes/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>AttributeTreeIsTheme</name>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
<entityParameter>
<name>IsTheme_param</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/attributetreeistheme/children/istheme_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/attributetreeistheme/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>ObjectRowId_param</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/attributetreeistheme/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/Activity_entity/entityfields/activityatrributes/children/attributetypes_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 84bbd00e
import("system.result");
import("Attribute_lib");
result.object([$AttributeTypes.THEME.toString()]);
\ No newline at end of file
entity/Activity_entity/entityfields/activityatrributes/children/objectrowid_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 84bbd00e
import("system.result");
import("system.vars");
result.string(vars.get("$field.ACTIVITYID"));
\ No newline at end of file
entity/Activity_entity/entityfields/activityatrributes/children/objecttype_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 84bbd00e
import("system.result");
import("Context_lib");
result.string(ContextUtils.getCurrentContextId());
entity/Activity_entity/entityfields/attributetreeistheme/children/istheme_param/valueProcess.js 0 → 100644
+ 3
− 0
View file @ 84bbd00e
import("system.result");
result.string(true);
\ No newline at end of file
entity/Activity_entity/entityfields/attributetreeistheme/children/objectrowid_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 84bbd00e
import("system.vars");
import("system.result");
result.string(vars.get("$field.ACTIVITYID"));
\ No newline at end of file
entity/Activity_entity/entityfields/attributetreeistheme/children/objecttype_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 84bbd00e
import("system.result");
import("Context_lib");
result.string(ContextUtils.getCurrentContextId());
entity/AttributeRelation_entity/AttributeRelation_entity.aod
+ 14
− 0
View file @ 84bbd00e
......@@ -84,6 +84,12 @@
<fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>80a034ee-c3fd-45e3-986c-d3854608c148</name>
<entityName>Activity_entity</entityName>
<fieldName>AttributeTreeIsTheme</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
......@@ -270,6 +276,14 @@
<name>ATTRIBUTE_TYPE</name>
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attribute_type/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>AttributeId_param</name>
<expose v="true" />
</entityParameter>
<entityParameter>
<name>IsTheme_param</name>
<expose v="true" />
</entityParameter>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
......
entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
+ 9
− 0
View file @ 84bbd00e
......@@ -74,6 +74,15 @@ if (rowId)
sqlCondition.and("1=1");
}
var IsTheme = vars.exists("$param.IsTheme_param") && vars.getString("$param.IsTheme_param") == "true";
if (IsTheme){
sqlCondition.andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", 'THEME');
}
else
{
sqlCondition.andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", 'THEME', "# != ?");
}
joinCondition.and("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID");
var defaultFields = [
......
entity/Attribute_entity/Attribute_entity.aod
+ 427
− 410
View file @ 84bbd00e
This diff is collapsed.
entity/Attribute_entity/entityfields/objectrowid_param/valueProcess.js 0 → 100644
+ 0
− 0
View file @ 84bbd00e
entity/Attribute_entity/entityfields/opendetails/onActionProcess.js 0 → 100644
+ 12
− 0
View file @ 84bbd00e
import("Context_lib");
import("system.vars");
import("system.neon");
var selection = vars.get("$sys.selection");
var params = {
"AttributeId_param" : selection[0],
"ObjectRowId_param" : vars.get("$param.ObjectRowId_param"),
"ObjectType_param" : vars.get("$param.ObjectType_param")
}
neon.openContext("AttributeRelation", "AttributeRelationTreeEdit_view", null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
entity/Order_entity/documentation.adoc
+ 6
− 2
View file @ 84bbd00e
......@@ -7,8 +7,12 @@ It provides data from database table _SALESORDER_.
== Actions
* _Copy order_: All values, orderitems included, are copyed and inserted in a new order (new order code, versnr. _1_).
* _New order version_: All values, orderitems included, are copyed and inserted in a **new order version** (versnr. + _1_).
* _Copy order_: All values, order items included, are copied and inserted in a new order (new order code, versnr. _1_).
* _New order version_: All values, order items included, are copied and inserted in a **new order version** (versnr. + _1_).
* _New Activity_: All values are copied and inserted in a new Activity (new activity code, versnr. _1_).
* _New Task_: All values are copied and inserted in a new Task (new task code, versnr. _1_).
* _Transfer Delivery Note_: All values are coped and inserted in a new Order with OrederType Delivery Note
== Submodules
......
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+ 43
− 3
View file @ 84bbd00e
......@@ -4896,6 +4896,48 @@
<entry>
<key>Theme</key>
</entry>
<entry>
<key>1</key>
</entry>
<entry>
<key>2</key>
</entry>
<entry>
<key>Action '</key>
</entry>
<entry>
<key>Invoice</key>
</entry>
<entry>
<key>Receipt Footer Text</key>
</entry>
<entry>
<key>Delivery note</key>
</entry>
<entry>
<key>Permission Action</key>
</entry>
<entry>
<key>Order confirmation</key>
</entry>
<entry>
<key>Receipt Header Text</key>
</entry>
<entry>
<key>Filter</key>
</entry>
<entry>
<key>Cancellation</key>
</entry>
<entry>
<key>Bulk mail \"%0\" sent</key>
</entry>
<entry>
<key>Actions</key>
</entry>
<entry>
<key>Credit</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
......@@ -4917,9 +4959,7 @@ select SCORETYPE from CLASSIFICATIONTYPE
union
select distinct CLASSIFICATIONGROUP from CLASSIFICATIONTYPE
union
select AB_ATTRIBUTE.ATTRIBUTE_NAME from AB_ATTRIBUTE
union
select AB_KEYWORD_ATTRIBUTE.NAME from AB_KEYWORD_ATTRIBUTE</element>
select AB_ATTRIBUTE.ATTRIBUTE_NAME from AB_ATTRIBUTE</element>
</statements>
</languageSql>
</sqlModels>
......
language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+ 42
− 0
View file @ 84bbd00e
......@@ -4946,6 +4946,48 @@
<entry>
<key>Theme</key>
</entry>
<entry>
<key>1</key>
</entry>
<entry>
<key>2</key>
</entry>
<entry>
<key>Action '</key>
</entry>
<entry>
<key>Invoice</key>
</entry>
<entry>
<key>Receipt Footer Text</key>
</entry>
<entry>
<key>Delivery note</key>
</entry>
<entry>
<key>Permission Action</key>
</entry>
<entry>
<key>Order confirmation</key>
</entry>
<entry>
<key>Receipt Header Text</key>
</entry>
<entry>
<key>Filter</key>
</entry>
<entry>
<key>Cancellation</key>
</entry>
<entry>
<key>Bulk mail \"%0\" sent</key>
</entry>
<entry>
<key>Actions</key>
</entry>
<entry>
<key>Credit</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
neonView/ActivityDetail_view/ActivityDetail_view.aod
+ 14
− 5
View file @ 84bbd00e
......@@ -6,20 +6,29 @@
<layout>
<boxLayout>
<name>layout</name>
<direction>HORIZONTAL</direction>
<maxDirectionElements v="2" />
</boxLayout>
</layout>
<children>
<neonViewReference>
<name>f3e3d589-16a5-45a3-878f-7f00548c4370</name>
<entityField>ActivityAtrributes</entityField>
<view>AttributeTree_view</view>
</neonViewReference>
<neonViewReference>
<name>9a9c4df0-abec-42b8-af90-b9fe57f28337</name>
<entityField>AttributeTreeIsTheme</entityField>
<view>AttributeRelationTree_view</view>
</neonViewReference>
<genericViewTemplate>
<name>OfferInfo</name>
<editMode v="false" />
<name>Generic</name>
<showDrawer v="true" />
<drawerCaption></drawerCaption>
<fixedDrawer v="true" />
<hideLabels v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>c7e75393-4745-478b-9f89-878b9a19b722</name>
<name>ca781b9b-9e93-41c3-9373-cb559c347194</name>
<entityField>INFO</entityField>
</entityFieldLink>
</fields>
......
neonView/AttributeTree_view/AttributeTree_view.aod
+ 4
− 0
View file @ 84bbd00e
......@@ -13,7 +13,11 @@
<parentField>ATTRIBUTE_PARENT_ID</parentField>
<titleField>ATTRIBUTE_NAME</titleField>
<descriptionField>ATTRIBUTE_TYPE</descriptionField>
<entryAction>openDetails</entryAction>
<entityField>#ENTITY</entityField>
<isCreatable v="false" />
<isEditable v="false" />
<isDeletable v="false" />
</treeViewTemplate>
</children>
</neonView>
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