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
Showing
with 183 additions and 5 deletions
...@@ -106,6 +106,7 @@ ...@@ -106,6 +106,7 @@
<name>newModule</name> <name>newModule</name>
<title>New module</title> <title>New module</title>
<iconId>VAADIN:PLUS_CIRCLE</iconId> <iconId>VAADIN:PLUS_CIRCLE</iconId>
<stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/stateProcess.js</stateProcess>
<children> <children>
<entityActionField> <entityActionField>
<name>newOffer</name> <name>newOffer</name>
...@@ -168,6 +169,10 @@ ...@@ -168,6 +169,10 @@
<name>BaseContextId_param</name> <name>BaseContextId_param</name>
<expose v="true" /> <expose v="true" />
</entityParameter> </entityParameter>
<entityParameter>
<name>ObjectStatus_param</name>
<expose v="true" />
</entityParameter>
</entityFields> </entityFields>
<recordContainers> <recordContainers>
<jDitoRecordContainer> <jDitoRecordContainer>
......
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
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AnyContact_entity/documentation.adoc</documentation> <documentation>%aditoprj%/entity/AnyContact_entity/documentation.adoc</documentation>
<contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess> <contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/AnyContact_entity/afterUiInit.js</afterUiInit>
<imageProcess>%aditoprj%/entity/AnyContact_entity/imageProcess.js</imageProcess> <imageProcess>%aditoprj%/entity/AnyContact_entity/imageProcess.js</imageProcess>
<recordContainer>db</recordContainer> <recordContainer>db</recordContainer>
<entityFields> <entityFields>
......
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
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<grantUpdateProcess>%aditoprj%/entity/Contact_entity/grantUpdateProcess.js</grantUpdateProcess> <grantUpdateProcess>%aditoprj%/entity/Contact_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/Contact_entity/grantDeleteProcess.js</grantDeleteProcess> <grantDeleteProcess>%aditoprj%/entity/Contact_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Contact_entity/contentTitleProcess.js</contentTitleProcess> <contentTitleProcess>%aditoprj%/entity/Contact_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Contact_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/Contact_entity/onValidation.js</onValidation> <onValidation>%aditoprj%/entity/Contact_entity/onValidation.js</onValidation>
<iconId>VAADIN:USERS</iconId> <iconId>VAADIN:USERS</iconId>
<titlePlural>Contacts</titlePlural> <titlePlural>Contacts</titlePlural>
......
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
...@@ -548,6 +548,10 @@ ...@@ -548,6 +548,10 @@
<name>ObjectRowId_param</name> <name>ObjectRowId_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js</valueProcess> <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter> </entityParameter>
<entityParameter>
<name>ObjectStatus_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/360degreeobjects/children/objectstatus_param/valueProcess.js</valueProcess>
</entityParameter>
</children> </children>
</entityConsumer> </entityConsumer>
<entityParameter> <entityParameter>
...@@ -822,6 +826,7 @@ ...@@ -822,6 +826,7 @@
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openeditdefaultsview/onActionProcess.js</onActionProcess> <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openeditdefaultsview/onActionProcess.js</onActionProcess>
<actionOrder v="1" /> <actionOrder v="1" />
<iconId>NEON:WRENCH</iconId> <iconId>NEON:WRENCH</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/openeditdefaultsview/stateProcess.js</stateProcess>
</entityActionField> </entityActionField>
<entityActionField> <entityActionField>
<name>newOffer</name> <name>newOffer</name>
...@@ -830,6 +835,7 @@ ...@@ -830,6 +835,7 @@
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newoffer/onActionProcess.js</onActionProcess> <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
<actionOrder v="2" /> <actionOrder v="2" />
<iconId>VAADIN:CART</iconId> <iconId>VAADIN:CART</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/newoffer/stateProcess.js</stateProcess>
</entityActionField> </entityActionField>
<entityActionField> <entityActionField>
<name>newActivity</name> <name>newActivity</name>
...@@ -853,12 +859,14 @@ ...@@ -853,12 +859,14 @@
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newtask/onActionProcess.js</onActionProcess> <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
<actionOrder v="3" /> <actionOrder v="3" />
<iconId>VAADIN:TASKS</iconId> <iconId>VAADIN:TASKS</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/newtask/stateProcess.js</stateProcess>
</entityActionField> </entityActionField>
<entityActionField> <entityActionField>
<name>newAppointment</name> <name>newAppointment</name>
<title>New appointment</title> <title>New appointment</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js</onActionProcess> <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CALENDAR</iconId> <iconId>VAADIN:CALENDAR</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/newappointment/stateProcess.js</stateProcess>
<tooltip>New Appointment</tooltip> <tooltip>New Appointment</tooltip>
</entityActionField> </entityActionField>
<entityActionGroup> <entityActionGroup>
...@@ -885,6 +893,7 @@ ...@@ -885,6 +893,7 @@
<isObjectAction v="false" /> <isObjectAction v="false" />
<isSelectionAction v="true" /> <isSelectionAction v="true" />
<iconId>VAADIN:AT</iconId> <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> <tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/tooltipProcess.js</tooltipProcess>
</entityActionField> </entityActionField>
<entityActionField> <entityActionField>
...@@ -894,6 +903,7 @@ ...@@ -894,6 +903,7 @@
<isObjectAction v="false" /> <isObjectAction v="false" />
<isSelectionAction v="true" /> <isSelectionAction v="true" />
<iconId>VAADIN:ENVELOPES</iconId> <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> <tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/tooltipProcess.js</tooltipProcess>
</entityActionField> </entityActionField>
<entityActionField> <entityActionField>
...@@ -913,6 +923,7 @@ ...@@ -913,6 +923,7 @@
<title>Add to Campaign</title> <title>Add to Campaign</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/addtocampaign/onActionProcess.js</onActionProcess> <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/addtocampaign/onActionProcess.js</onActionProcess>
<iconId>NEON:GROUP_APPOINTMENT</iconId> <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> <tooltip>Choose a campaign and a step to add the contact to a campaign</tooltip>
</entityActionField> </entityActionField>
<entityActionField> <entityActionField>
...@@ -920,12 +931,14 @@ ...@@ -920,12 +931,14 @@
<title>Write email</title> <title>Write email</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newemail/onActionProcess.js</onActionProcess> <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newemail/onActionProcess.js</onActionProcess>
<iconId>VAADIN:AT</iconId> <iconId>VAADIN:AT</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/newemail/stateProcess.js</stateProcess>
</entityActionField> </entityActionField>
<entityActionField> <entityActionField>
<name>newLetter</name> <name>newLetter</name>
<title>New letter</title> <title>New letter</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newletter/onActionProcess.js</onActionProcess> <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newletter/onActionProcess.js</onActionProcess>
<iconId>VAADIN:ENVELOPE</iconId> <iconId>VAADIN:ENVELOPE</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/newletter/stateProcess.js</stateProcess>
</entityActionField> </entityActionField>
<entityActionField> <entityActionField>
<name>openAdminView</name> <name>openAdminView</name>
......
import("Keyword_lib");
import("KeywordRegistry_basic");
import("system.neon"); import("system.neon");
import("system.vars"); import("system.vars");
import("Context_lib"); import("Context_lib");
import("Attribute_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) if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{ {
AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes"); AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
......
import("system.vars");
import("system.result");
result.string(vars.get("$field.STATUS"));
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
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
import("KeywordRegistry_basic");
import("system.db"); import("system.db");
import("system.vars"); import("system.vars");
import("system.neon"); import("system.neon");
...@@ -12,4 +13,7 @@ if(contactCount > 0) ...@@ -12,4 +13,7 @@ if(contactCount > 0)
else else
{ {
result.string(neon.COMPONENTSTATE_DISABLED); 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
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
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
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
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
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
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
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
import("system.vars"); import("system.vars");
import("system.result"); import("system.result");
import("system.neon"); import("system.neon");
import("KeywordRegistry_basic");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW) { 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 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% 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