Skip to content
Snippets Groups Projects
Commit e4db28b5 authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

Merge branch '#1052905-HandlingOfInActiveContacts' into '2020.1.0' 

#1052905 handling of in active contacts

See merge request xrm/basic!200
parents a06e580d 081793e2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 183 additions and 5 deletions
entity/360Degree_entity/360Degree_entity.aod
+ 5
− 0
View file @ e4db28b5
......@@ -106,6 +106,7 @@
<name>newModule</name>
<title>New module</title>
<iconId>VAADIN:PLUS_CIRCLE</iconId>
<stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/stateProcess.js</stateProcess>
<children>
<entityActionField>
<name>newOffer</name>
......@@ -168,6 +169,10 @@
<name>BaseContextId_param</name>
<expose v="true" />
</entityParameter>
<entityParameter>
<name>ObjectStatus_param</name>
<expose v="true" />
</entityParameter>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
......
entity/360Degree_entity/entityfields/newmodule/stateProcess.js 0 → 100644
+ 9
− 0
View file @ e4db28b5
import("system.vars");
import("system.neon");
import("system.result");
import("KeywordRegistry_basic");
var objectStatusParam = vars.get("$param.ObjectStatus_param");
if (objectStatusParam == $KeywordRegistry.contactStatus$inactive())
result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
entity/AnyContact_entity/AnyContact_entity.aod
+ 1
− 0
View file @ e4db28b5
......@@ -4,6 +4,7 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AnyContact_entity/documentation.adoc</documentation>
<contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/AnyContact_entity/afterUiInit.js</afterUiInit>
<imageProcess>%aditoprj%/entity/AnyContact_entity/imageProcess.js</imageProcess>
<recordContainer>db</recordContainer>
<entityFields>
......
entity/AnyContact_entity/afterUiInit.js 0 → 100644
+ 23
− 0
View file @ e4db28b5
import("system.neon");
import("Keyword_lib");
import("system.vars");
import("KeywordRegistry_basic");
var statusFilterElement = {
"type":"row",
"name":"STATUS",
"operator":"NOT_EQUAL",
"key":$KeywordRegistry.contactStatus$inactive(),
"contenttype": vars.get("$property.STATUS.contentType")
};
statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusFilterElement.key);
var filter = {
"type":"group",
"operator":"AND",
"childs": [statusFilterElement]
};
filter = JSON.stringify(filter);
neon.setFilter("#ENTITY", filter);
\ No newline at end of file
entity/Contact_entity/Contact_entity.aod
+ 1
− 0
View file @ e4db28b5
......@@ -8,6 +8,7 @@
<grantUpdateProcess>%aditoprj%/entity/Contact_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/Contact_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Contact_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Contact_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/Contact_entity/onValidation.js</onValidation>
<iconId>VAADIN:USERS</iconId>
<titlePlural>Contacts</titlePlural>
......
entity/Contact_entity/afterUiInit.js 0 → 100644
+ 23
− 0
View file @ e4db28b5
import("system.neon");
import("Keyword_lib");
import("system.vars");
import("KeywordRegistry_basic");
var statusFilterElement = {
"type":"row",
"name":"STATUS",
"operator":"NOT_EQUAL",
"key":$KeywordRegistry.contactStatus$inactive(),
"contenttype": vars.get("$property.STATUS.contentType")
};
statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusFilterElement.key);
var filter = {
"type":"group",
"operator":"AND",
"childs": [statusFilterElement]
};
filter = JSON.stringify(filter);
neon.setFilter("#ENTITY", filter);
\ No newline at end of file
entity/Organisation_entity/Organisation_entity.aod
+ 13
− 0
View file @ e4db28b5
......@@ -548,6 +548,10 @@
<name>ObjectRowId_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>ObjectStatus_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/360degreeobjects/children/objectstatus_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityParameter>
......@@ -822,6 +826,7 @@
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openeditdefaultsview/onActionProcess.js</onActionProcess>
<actionOrder v="1" />
<iconId>NEON:WRENCH</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/openeditdefaultsview/stateProcess.js</stateProcess>
</entityActionField>
<entityActionField>
<name>newOffer</name>
......@@ -830,6 +835,7 @@
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
<actionOrder v="2" />
<iconId>VAADIN:CART</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/newoffer/stateProcess.js</stateProcess>
</entityActionField>
<entityActionField>
<name>newActivity</name>
......@@ -853,12 +859,14 @@
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
<actionOrder v="3" />
<iconId>VAADIN:TASKS</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/newtask/stateProcess.js</stateProcess>
</entityActionField>
<entityActionField>
<name>newAppointment</name>
<title>New appointment</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CALENDAR</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/newappointment/stateProcess.js</stateProcess>
<tooltip>New Appointment</tooltip>
</entityActionField>
<entityActionGroup>
......@@ -885,6 +893,7 @@
<isObjectAction v="false" />
<isSelectionAction v="true" />
<iconId>VAADIN:AT</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js</stateProcess>
<tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityActionField>
......@@ -894,6 +903,7 @@
<isObjectAction v="false" />
<isSelectionAction v="true" />
<iconId>VAADIN:ENVELOPES</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js</stateProcess>
<tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityActionField>
......@@ -913,6 +923,7 @@
<title>Add to Campaign</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/addtocampaign/onActionProcess.js</onActionProcess>
<iconId>NEON:GROUP_APPOINTMENT</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/addtocampaign/stateProcess.js</stateProcess>
<tooltip>Choose a campaign and a step to add the contact to a campaign</tooltip>
</entityActionField>
<entityActionField>
......@@ -920,12 +931,14 @@
<title>Write email</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newemail/onActionProcess.js</onActionProcess>
<iconId>VAADIN:AT</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/newemail/stateProcess.js</stateProcess>
</entityActionField>
<entityActionField>
<name>newLetter</name>
<title>New letter</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newletter/onActionProcess.js</onActionProcess>
<iconId>VAADIN:ENVELOPE</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/newletter/stateProcess.js</stateProcess>
</entityActionField>
<entityActionField>
<name>openAdminView</name>
......
entity/Organisation_entity/afterUiInit.js
+ 21
− 0
View file @ e4db28b5
import("Keyword_lib");
import("KeywordRegistry_basic");
import("system.neon");
import("system.vars");
import("Context_lib");
import("Attribute_lib");
var statusFilterElement = {
"type":"row",
"name":"STATUS",
"operator":"NOT_EQUAL",
"key":$KeywordRegistry.contactStatus$inactive(),
"contenttype": vars.get("$property.STATUS.contentType")
};
statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusFilterElement.key);
var filter = {
"type":"group",
"operator":"AND",
"childs": [statusFilterElement]
};
filter = JSON.stringify(filter);
neon.setFilter("#ENTITY", filter);
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
......
entity/Organisation_entity/entityfields/360degreeobjects/children/objectstatus_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ e4db28b5
import("system.vars");
import("system.result");
result.string(vars.get("$field.STATUS"));
entity/Organisation_entity/entityfields/addtocampaign/stateProcess.js 0 → 100644
+ 7
− 0
View file @ e4db28b5
import("system.result");
import("system.neon");
import("system.vars");
import("KeywordRegistry_basic");
if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js 0 → 100644
+ 9
− 0
View file @ e4db28b5
import("system.neon");
import("system.neon");
import("system.result");
import("KeywordRegistry_basic");
import("system.vars");
if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
+ 5
− 1
View file @ e4db28b5
import("KeywordRegistry_basic");
import("system.db");
import("system.vars");
import("system.neon");
......@@ -12,4 +13,7 @@ if(contactCount > 0)
else
{
result.string(neon.COMPONENTSTATE_DISABLED);
}
\ No newline at end of file
}
if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js 0 → 100644
+ 8
− 0
View file @ e4db28b5
import("system.neon");
import("system.result");
import("KeywordRegistry_basic");
import("system.vars");
if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
entity/Organisation_entity/entityfields/newappointment/stateProcess.js 0 → 100644
+ 7
− 0
View file @ e4db28b5
import("system.result");
import("system.neon");
import("system.vars");
import("KeywordRegistry_basic");
if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
entity/Organisation_entity/entityfields/newemail/stateProcess.js 0 → 100644
+ 7
− 0
View file @ e4db28b5
import("system.result");
import("system.neon");
import("system.vars");
import("KeywordRegistry_basic");
if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
entity/Organisation_entity/entityfields/newletter/stateProcess.js 0 → 100644
+ 7
− 0
View file @ e4db28b5
import("system.result");
import("system.neon");
import("system.vars");
import("KeywordRegistry_basic");
if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
entity/Organisation_entity/entityfields/newoffer/stateProcess.js 0 → 100644
+ 7
− 0
View file @ e4db28b5
import("system.result");
import("system.neon");
import("system.vars");
import("KeywordRegistry_basic");
if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
entity/Organisation_entity/entityfields/newtask/stateProcess.js 0 → 100644
+ 7
− 0
View file @ e4db28b5
import("system.result");
import("system.neon");
import("system.vars");
import("KeywordRegistry_basic");
if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
entity/Organisation_entity/entityfields/openeditdefaultsview/stateProcess.js 0 → 100644
+ 7
− 0
View file @ e4db28b5
import("system.result");
import("system.neon");
import("system.vars");
import("KeywordRegistry_basic");
if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
entity/Organisation_entity/entityfields/picture/displayValueProcess.js
+ 12
− 4
View file @ e4db28b5
import("system.vars");
import("system.result");
import("system.neon");
import("KeywordRegistry_basic");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW) {
if (vars.get("$field.PICTURE"))
result.string(vars.get("$field.PICTURE"));
if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
result.string("VAADIN:CLOSE_BIG")
else
result.string(vars.get("$param.AvatarText_param"));
}
{
if (vars.get("$field.PICTURE"))
result.string(vars.get("$field.PICTURE"));
else
result.string(vars.get("$param.AvatarText_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