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

merged origin/2020.1 into master

parents efe5a81d f6e2ffd0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 128 additions and 71 deletions
entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+ 1
− 1
View file @ df2eb698
......@@ -186,7 +186,7 @@
<entityField>
<name>campaignStepMaxParticipantCount</name>
<title>Max participants</title>
<displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/displayValueProcess.js</displayValueProcess>
<valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ADVERTISINGBAN_ICON</name>
......
entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/valueProcess.js 0 → 100644
+ 8
− 0
View file @ df2eb698
import("system.result");
import("system.vars");
import("Campaign_lib");
if(vars.get("$field.CAMPAIGNSTEP_ID"))
result.string(CampaignUtils.getMaxParticipantCountForStep(vars.get("$field.CAMPAIGNSTEP_ID")));
else
result.string(0)
\ No newline at end of file
entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
+ 8
− 1
View file @ df2eb698
......@@ -71,11 +71,18 @@
</entityField>
<entityActionField>
<name>safeandexport</name>
<title>export using the selected template</title>
<title>export using the selected template</title>
<onActionProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/safeandexport/onActionProcess.js</onActionProcess>
<isMenuAction v="true" />
<iconId>NEON:EXPORT</iconId>
<stateProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/safeandexport/stateProcess.js</stateProcess>
</entityActionField>
<entityField>
<name>exportCount</name>
<documentation>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exportcount/documentation.adoc</documentation>
<titleProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exportcount/titleProcess.js</titleProcess>
<valueProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exportcount/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
<datalessRecordContainer>
......
entity/ExportTemplateSelection_entity/entityfields/exportcount/documentation.adoc 0 → 100644
+ 2
− 0
View file @ df2eb698
== exportCount;
needed for the score card, to display extra information.
entity/ExportTemplateSelection_entity/entityfields/exportcount/titleProcess.js 0 → 100644
+ 13
− 0
View file @ df2eb698
import("system.translate");
import("system.result");
import("system.vars");
var comingFrom = vars.get("$field.comingfrom")
var res
if(comingFrom == "Organisation")
res = translate.text("Organisations will be exported");
else if(comingFrom == "Person")
res = translate.text("Contacts will be exported");
result.string(res)
\ No newline at end of file
entity/ExportTemplateSelection_entity/entityfields/exportcount/valueProcess.js 0 → 100644
+ 10
− 0
View file @ df2eb698
import("FilterviewMenuAction_lib");
import("system.vars");
import("system.result");
var selection = vars.getString("$field.selection");
if(selection)
result.string(JSON.parse(selection).length);
else
result.string(0);
\ No newline at end of file
entity/ExportTemplateSelection_entity/entityfields/safeandexport/onActionProcess.js
+ 2
− 1
View file @ df2eb698
......@@ -7,7 +7,8 @@ var templateId = vars.get("$field.EXPORTTEMPLATE_ID");
var selection = vars.get("$field.selection");
var comingFrom = vars.get("$field.comingfrom");
if(templateId){
if(templateId)
{
var document = ExportTemplateUtils.buildExport(templateId, selection, comingFrom, filename);
neon.download(document.content, document.filename);
}
\ No newline at end of file
entity/ExportTemplateSelection_entity/entityfields/selection/valueProcess.js
+ 16
− 2
View file @ df2eb698
import("FilterviewMenuAction_lib");
import("system.vars");
import("system.result");
if(vars.get("$param.selectedData_param"))
result.string(vars.get("$param.selectedData_param"));
\ No newline at end of file
var selection = JSON.parse(vars.getString("$param.selectedData_param"));
var comingfrom = vars.getString("$param.comingFrom_param");
var contactIds;
if(!Array.isArray(selection)) //if selection is an array, data has been selected
{
var condition = selection.condition;
if(comingfrom == "Organisation")
contactIds = FilterviewMenuActionUtils.organisationIdsFilter(condition);
else if (comingfrom == "Person")
contactIds = FilterviewMenuActionUtils.contactIdsFilter(condition);
}
result.string(JSON.stringify(contactIds));
entity/Organisation_entity/Organisation_entity.aod
+ 2
− 2
View file @ df2eb698
......@@ -902,8 +902,8 @@
<title>Add to Bulkmail</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<isSelectionAction v="true" />
<iconId>VAADIN:AT</iconId>
<state>EDITABLE</state>
<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>
......@@ -912,7 +912,6 @@
<title>Add to serial letter</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js</onActionProcess>
<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>
......@@ -924,6 +923,7 @@
<isMenuAction v="true" />
<isObjectAction v="false" />
<iconId>NEON:EXPORT</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js</stateProcess>
<tooltip>Export fields of this table</tooltip>
<tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/tooltipProcess.js</tooltipProcess>
</entityActionField>
......
entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
+ 11
− 3
View file @ df2eb698
import("Bulkmail_lib");
import("system.vars");
import("system.neon");
if (vars.exists("$sys.selection"))
BulkMailUtils.openAddRecipientView(vars.getString("$sys.selection"));
\ No newline at end of file
var sysSelection = vars.get("$sys.selection");
if(sysSelection.length > 0) //if data selected -> use selected data
{
BulkMailUtils.addParticipantsByRowIds(JSON.stringify(sysSelection));
}
else //else -> use Filtercondition
{
let sysFilter = vars.get("$sys.filter");
BulkMailUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
}
entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
+ 4
− 6
View file @ df2eb698
import("system.neon");
import("system.neon");
import("system.result");
import("KeywordRegistry_basic");
import("FilterviewMenuAction_lib");
import("system.vars");
import("system.result");
var contactCount = vars.get("$sys.datarowcount");
if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
result.string(FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
+ 5
− 11
View file @ df2eb698
......@@ -4,18 +4,12 @@ import("Campaign_lib");
var sysSelection = vars.get("$sys.selection");
/*
* If there's a selection only those are ought to be added.
* Otherwise the filter gets checked, if a filter has beed set, the condition
* is used to determine the objects to be added.
* If no selection has been set, all objects will be added.
*/
if(sysSelection.length > 0) //selektierte IDs als Array
if(sysSelection.length > 0) //if data selected -> use selected data
{
CampaignUtils.addParticipantsByRowIds(JSON.stringify(sysSelection), "ORGANISATION");
CampaignUtils.addParticipantsByRowIds(JSON.stringify(sysSelection), vars.get("$sys.currentcontextname"));
}
else
else //else -> use Filtercondition
{
let sysFilter = vars.get("$sys.filter");//todo change name
CampaignUtils.addParticipantsByCondition(JSON.stringify(sysFilter), "ORGANISATION");
let sysFilter = vars.get("$sys.filter");
CampaignUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
}
\ No newline at end of file
entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
+ 2
− 14
View file @ df2eb698
import("KeywordRegistry_basic");
import("system.db");
import("FilterviewMenuAction_lib");
import("system.vars");
import("system.neon");
import("system.result");
var contactCount = vars.get("$sys.datarowcount");
if(contactCount > 0)
{
result.string(neon.COMPONENTSTATE_EDITABLE);
}
else
{
result.string(neon.COMPONENTSTATE_DISABLED);
}
if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount);
\ No newline at end of file
entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
+ 11
− 3
View file @ df2eb698
import("Bulkmail_lib");
import("system.vars");
import("system.neon");
if (vars.exists("$sys.selection"))
SerialLetterUtils.openAddRecipientView(vars.getString("$sys.selection"));
\ No newline at end of file
var sysSelection = vars.get("$sys.selection");
if(sysSelection.length > 0) //if data selected -> use selected data
{
SerialLetterUtils.addParticipantsByRowIds(JSON.stringify(sysSelection));
}
else //else -> use Filtercondition
{
let sysFilter = vars.get("$sys.filter");
SerialLetterUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
}
\ No newline at end of file
entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js
+ 4
− 5
View file @ df2eb698
import("system.neon");
import("system.result");
import("KeywordRegistry_basic");
import("FilterviewMenuAction_lib");
import("system.vars");
import("system.result");
var contactCount = vars.get("$sys.datarowcount");
if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
result.string(FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
+ 5
− 12
View file @ df2eb698
import("system.neon");
import("ExportTemplate_lib");
import("system.vars");
var sysSelection = vars.get("$sys.selection");
var params;
if(sysSelection.length > 0) //if data selected -> use selected data
{
params = {
"selectedData_param" : JSON.stringify(sysSelection),
"comingFrom_param" : vars.get("$sys.currentcontextname")}
neon.openContext("ExportTemplateSelection", "ExportTemplateSelectionEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
ExportTemplateUtils.addParticipantsByRowIds(JSON.stringify(sysSelection), vars.get("$sys.currentcontextname"));
}
else //else -> use Filtercondition
{
let sysFilter = vars.get("$sys.filter");
params = {
"selectedData_param" : JSON.stringify(sysFilter),
"comingFrom_param" : vars.get("$sys.currentcontextname")}
neon.openContext("ExportTemplateSelection", "ExportTemplateSelectionEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
}
ExportTemplateUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
}
\ No newline at end of file
entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js 0 → 100644
+ 7
− 0
View file @ df2eb698
import("system.result");
import("FilterviewMenuAction_lib");
import("system.vars");
var contactCount = vars.get("$sys.datarowcount");
result.string(FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
entity/Person_entity/Person_entity.aod
+ 2
− 2
View file @ df2eb698
......@@ -1045,7 +1045,6 @@
<title>Add to Bulkmail</title>
<onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<isSelectionAction v="true" />
<iconId>VAADIN:AT</iconId>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js</stateProcess>
<tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/tooltipProcess.js</tooltipProcess>
......@@ -1054,8 +1053,8 @@
<name>addToSerialLetter</name>
<title>Add to serial letter</title>
<onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js</onActionProcess>
<isMenuAction v="true" />
<isObjectAction v="false" />
<isSelectionAction v="true" />
<iconId>VAADIN:ENVELOPES</iconId>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js</stateProcess>
<tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/tooltipProcess.js</tooltipProcess>
......@@ -1066,6 +1065,7 @@
<onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<iconId>NEON:EXPORT</iconId>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js</stateProcess>
<tooltip>Export fields of this table</tooltip>
<tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/export/tooltipProcess.js</tooltipProcess>
</entityActionField>
......
entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
+ 11
− 3
View file @ df2eb698
import("Bulkmail_lib");
import("system.vars");
import("system.neon");
if (vars.exists("$sys.selection"))
BulkMailUtils.openAddRecipientView(vars.getString("$sys.selection"));
\ No newline at end of file
var sysSelection = vars.get("$sys.selection");
if(sysSelection.length > 0) //if data selected -> use selected data
{
BulkMailUtils.addParticipantsByRowIds(JSON.stringify(sysSelection));
}
else //else -> use Filtercondition
{
let sysFilter = vars.get("$sys.filter");
BulkMailUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
}
\ No newline at end of file
entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
+ 4
− 5
View file @ df2eb698
import("FilterviewMenuAction_lib");
import("system.vars");
import("system.neon");
import("system.result");
import("system.result");
import("KeywordRegistry_basic");
if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
var contactCount = vars.get("$sys.datarowcount");
FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount);
\ 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