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 287 additions and 120 deletions
entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
+ 4
− 10
View file @ df2eb698
......@@ -2,20 +2,14 @@ import("system.vars");
import("system.neon");
import("Campaign_lib");
/*
* 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.
*/
var sysSelection = vars.get("$sys.selection");
if(sysSelection.length > 0) //selektierte IDs als Array
if(sysSelection.length > 0) //if data selected -> use selected data
{
CampaignUtils.addParticipantsByRowIds(JSON.stringify(sysSelection), "PERSON");
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), "PERSON");
CampaignUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
}
\ No newline at end of file
entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
+ 3
− 15
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")
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/Person_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/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js
+ 4
− 4
View file @ df2eb698
import("system.neon");
import("FilterviewMenuAction_lib");
import("system.vars");
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
entity/Person_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
+ 5
− 11
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
{
var 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);
let sysFilter = vars.get("$sys.filter");
ExportTemplateUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
}
\ No newline at end of file
entity/Person_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js 0 → 100644
+ 7
− 0
View file @ df2eb698
import("FilterviewMenuAction_lib");
import("system.vars");
import("system.result");
var contactCount = vars.get("$sys.datarowcount");
FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount);
\ No newline at end of file
entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
+ 16
− 0
View file @ df2eb698
......@@ -49,11 +49,27 @@
<iconId>VAADIN:ENVELOPES</iconId>
<stateProcess>%aditoprj%/entity/SerialLetterAddRecipients_entity/entityfields/addparticipants/stateProcess.js</stateProcess>
</entityActionField>
<entityParameter>
<name>comingFrom_param</name>
<expose v="true" />
</entityParameter>
<entityField>
<name>currentRecipients</name>
<documentation>%aditoprj%/entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/documentation.adoc</documentation>
<title>Current Recipients</title>
<valueProcess>%aditoprj%/entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>recipientcount</name>
<state>EDITABLE</state>
<valueProcess>%aditoprj%/entity/SerialLetterAddRecipients_entity/entityfields/recipientcount/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>futureRecipients</name>
<documentation>%aditoprj%/entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/documentation.adoc</documentation>
<title>Recipients after adding</title>
<valueProcess>%aditoprj%/entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
<datalessRecordContainer>
......
entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/documentation.adoc 0 → 100644
+ 2
− 0
View file @ df2eb698
== currentRecipients;
needed for the score card, to display extra information.
entity/SerialLetterAddRecipients_entity/entityfields/currentrecipients/valueProcess.js 0 → 100644
+ 13
− 0
View file @ df2eb698
import("system.logging");
import("system.result");
import("system.vars");
import("Sql_lib");
var currentCount = newSelect("count(CONTACT_ID)")
.from("LETTERRECIPIENT")
.where("LETTERRECIPIENT.SERIALLETTER_ID", vars.get("$field.SERIALLETTER_ID"))
.cell();
if(currentCount)
result.string(currentCount);
else
result.string("0");
\ No newline at end of file
entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/documentation.adoc 0 → 100644
+ 2
− 0
View file @ df2eb698
== futureRecipients;
needed for the score card, to display extra information.
entity/SerialLetterAddRecipients_entity/entityfields/futurerecipients/valueProcess.js 0 → 100644
+ 9
− 0
View file @ df2eb698
import("system.vars");
import("system.result");
import("system.eMath")
var res = eMath.addInt(vars.get("$field.recipientcount"), vars.get("$field.currentRecipients"));
if(res)
result.string(res);
else
result.string(0);
\ No newline at end of file
entity/SerialLetterAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
+ 14
− 3
View file @ df2eb698
import("FilterviewMenuAction_lib");
import("Contact_lib");
import("system.result");
import("Bulkmail_lib");
......@@ -7,7 +8,18 @@ import("system.db");
import("Sql_lib");
import("system.vars");
var contactIds = JSON.parse(vars.getString("$param.ContactIds_param"));
var selection = JSON.parse(vars.getString("$param.ContactIds_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);
}
var serialLetterId = vars.get("$field.SERIALLETTER_ID")
var res;
......@@ -16,5 +28,4 @@ if (serialLetterId)
else
res = null;
result.string(res);
result.string(res);
\ No newline at end of file
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+ 34
− 9
View file @ df2eb698
......@@ -6866,6 +6866,40 @@
<entry>
<key>workflow notification</key>
</entry>
<entry>
<key>Workflow Model</key>
</entry>
<entry>
<key>Current Recipients</key>
</entry>
<entry>
<key>The workflow could not be deployed</key>
</entry>
<entry>
<key>Workflow deploy failed</key>
</entry>
<entry>
<key>%0 new recipients will be added to the bulk mail. \n\&#xD;
%1 of the chosen records are already recipients or don't have an e-mail set</key>
</entry>
<entry>
<key>Recipients after adding</key>
</entry>
<entry>
<key>%0 of the chosen records are already recipients or don't have an e-mail set</key>
</entry>
<entry>
<key>Organisations will be exported</key>
</entry>
<entry>
<key>Contacts will be exported</key>
</entry>
<entry>
<key>%0 new participants will be added to the campaign.</key>
</entry>
<entry>
<key>%0 of the chosen records are already in the campaign</key>
</entry>
<entry>
<key>Permission received</key>
</entry>
......@@ -6884,21 +6918,12 @@
<entry>
<key>Total in euros</key>
</entry>
<entry>
<key>Workflow Model</key>
</entry>
<entry>
<key>{SENT_MAIL}</key>
</entry>
<entry>
<key>The Sales Project can only be filled when a company has been specified</key>
</entry>
<entry>
<key>The workflow could not be deployed</key>
</entry>
<entry>
<key>Workflow deploy failed</key>
</entry>
<entry>
<key>Ø Probability</key>
</entry>
......
language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+ 76
− 25
View file @ df2eb698
......@@ -85,10 +85,6 @@
<key>Has marketing approved this step?</key>
<value>Hat das Marketing diesem Schritt zugestimmt?</value>
</entry>
<entry>
<key>Create model</key>
<value>Modell erstellen</value>
</entry>
<entry>
<key>Task done</key>
<value>Aufgabe abgeschlossen</value>
......@@ -711,10 +707,6 @@
<key>None</key>
<value>Keine</value>
</entry>
<entry>
<key>Edit workflow</key>
<value>Workflow bearbeiten</value>
</entry>
<entry>
<key>Date of request</key>
<value>Datum der Anforderung</value>
......@@ -8871,12 +8863,7 @@ Bitte Datumseingabe prüfen</value>
<key>yellow</key>
</entry>
<entry>
<key>Add Recipients</key>
<value>Empfänger hinzufügen</value>
</entry>
<entry>
<key>Add Participants</key>
<value>Teilnehmer hinzufügen</value>
<key>Borrow</key>
</entry>
<entry>
<key>Is unlinked activity</key>
......@@ -8915,6 +8902,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>No new recipients found that can be added to the serial letter.</key>
<value>Keine neuen Teilnehmer gefunden die zum Serienbrief hinzugefügt werden können.</value>
</entry>
<entry>
<key>New</key>
......@@ -8939,13 +8927,67 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>No new recipients found that can be added to the bulk mail.</key>
<value>Keine neuen Teilnehmer gefunden die zur Serienmail hinzugefügt werden können.</value>
</entry>
<entry>
<key>Total in euros</key>
<key>Current Recipients</key>
<value>Aktuelle Empfänger</value>
</entry>
<entry>
<key>The workflow could not be deployed</key>
</entry>
<entry>
<key>Workflow deploy failed</key>
</entry>
<entry>
<key>Create model</key>
</entry>
<entry>
<key>Edit workflow</key>
</entry>
<entry>
<key>Recipients after adding</key>
<value>Empfänger nach dem hinzufügen</value>
</entry>
<entry>
<key>%0 new recipients will be added to the bulk mail.</key>
<value>Der Serienmail werden %0 neue Empfänger hinzugefügt.</value>
</entry>
<entry>
<key>%0 new participants will be added to the campaign.</key>
<value>Der Kampagne werden %0 neue Empfänger hinzugefügt.</value>
</entry>
<entry>
<key>%0 of the chosen records are already recipients or don't have an e-mail set</key>
<value>%0 der ausgewählten Datensätze sind entweder schon Empfänger oder haben keine E-Mail Addresse angegeben.
</value>
</entry>
<entry>
<key>%0 of the chosen records are already in the campaign</key>
<value>%0 der ausgewählten Datensätze sind schon in der Kampagne.</value>
</entry>
<entry>
<key>Organisations will be exported</key>
<value>Firmen werden exportiert</value>
</entry>
<entry>
<key>Contacts will be exported</key>
<value>Kontakte werden exportiert</value>
</entry>
<entry>
<key>%0 new recipients will be added to the bulk mail. \n\&#xD;
%1 of the chosen records are already recipients or don't have an e-mail set</key>
</entry>
<entry>
<key>download ready</key>
</entry>
<entry>
<key>export using the selected template</key>
<value>Mit der ausgewählten Vorlage Exportieren</value>
</entry>
<entry>
<key>send mail</key>
<value>E-Mail losschicken</value>
<value>E-Mail versenden</value>
</entry>
<entry>
<key>Receive new Department Permission</key>
......@@ -9010,6 +9052,8 @@ Bitte Datumseingabe prüfen</value>
<entry>
<key>Calendar maintime end</key>
<value>Kalender-Kernzeit Ende</value>
<key>Add Participants</key>
<value>Teilnehmer hinzufügen</value>
</entry>
<entry>
<key>Release</key>
......@@ -9040,32 +9084,36 @@ Bitte Datumseingabe prüfen</value>
<key>The Sales Project can only be filled when a company has been specified</key>
</entry>
<entry>
<key>Calendar hour divider</key>
<value>Kalender-Stundenunterteilung</value>
<key>Add Recipients</key>
<value>Teilnehmer hinzufügen</value>
</entry>
<entry>
<key>Grant new User Permission</key>
<key>{SEND_MAIL}</key>
</entry>
<entry>
<key>SELECTION_BOTH</key>
<key>download ready</key>
</entry>
<entry>
<key>Latitude</key>
</entry>
<entry>
<key>{SEND_MAIL}</key>
<key>Longitude</key>
</entry>
<entry>
<key>SELECTION_POSTFIX</key>
<key>Permission Procurer User</key>
<value>Rechteempfänger Benutzer</value>
</entry>
<entry>
<key>download ready</key>
<key>Grant new User Permission</key>
<value>Neue Benutzer-Berechtigung vergeben</value>
</entry>
<entry>
<key>Password must contain letters</key>
<key>Permission Procurer Department</key>
<value>Rechteempfänger Abteilung</value>
</entry>
<entry>
<key>SELECTION_PREFIX</key>
<key>Grant new Department Permission</key>
<value>Neue Abteilungs-Berechtigung vergeben</value>
</entry>
<entry>
<key>Password must contain spaces</key>
......@@ -9076,6 +9124,9 @@ Bitte Datumseingabe prüfen</value>
<entry>
<key>The use of any of your previous %0 passwords is prohibited</key>
</entry>
<entry>
<key>Total in euros</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+ 37
− 12
View file @ df2eb698
......@@ -7020,13 +7020,19 @@
<key>send mail</key>
</entry>
<entry>
<key>Receive new Department Permission</key>
<key>and open modeler</key>
</entry>
<entry>
<key>Receive new User Permission</key>
<key>Workflow Model</key>
</entry>
<entry>
<key>and open modeler</key>
<key>Current Recipients</key>
</entry>
<entry>
<key>The workflow could not be deployed</key>
</entry>
<entry>
<key>Workflow deploy failed</key>
</entry>
<entry>
<key>Create model</key>
......@@ -7034,6 +7040,34 @@
<entry>
<key>Edit workflow</key>
</entry>
<entry>
<key>%0 new recipients will be added to the bulk mail. \n\&#xD;
%1 of the chosen records are already recipients or don't have an e-mail set</key>
</entry>
<entry>
<key>Recipients after adding</key>
</entry>
<entry>
<key>%0 of the chosen records are already recipients or don't have an e-mail set</key>
</entry>
<entry>
<key>Organisations will be exported</key>
</entry>
<entry>
<key>Contacts will be exported</key>
</entry>
<entry>
<key>%0 new participants will be added to the campaign.</key>
</entry>
<entry>
<key>%0 of the chosen records are already in the campaign</key>
</entry>
<entry>
<key>Receive new Department Permission</key>
</entry>
<entry>
<key>Receive new User Permission</key>
</entry>
<entry>
<key>workflow notification</key>
</entry>
......@@ -7055,9 +7089,6 @@
<entry>
<key>Total in euros</key>
</entry>
<entry>
<key>Workflow Model</key>
</entry>
<entry>
<key>The Sales Project can only be filled when a company has been specified</key>
</entry>
......@@ -7065,12 +7096,6 @@
<key>{SEND_MAIL}</key>
<value>Send mail</value>
</entry>
<entry>
<key>The workflow could not be deployed</key>
</entry>
<entry>
<key>Workflow deploy failed</key>
</entry>
<entry>
<key>Probability AI</key>
</entry>
......
neonContext/CampaignAddParticipants/CampaignAddParticipants.aod
+ 0
− 4
View file @ df2eb698
......@@ -9,9 +9,5 @@
<name>c4f11246-9c24-4c1c-8e53-96acabf04bab</name>
<view>CampaignAddParticipantsEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>87d572bd-f2ce-4283-8db0-a7d9f9441fa0</name>
<view>campaignParticipantMessage_view</view>
</neonViewReference>
</references>
</neonContext>
neonView/BulkMailAddRecipientsEdit_view/BulkMailAddRecipientsEdit_view.aod
+ 17
− 2
View file @ df2eb698
......@@ -6,11 +6,26 @@
<isOverlay v="false" />
<overlayOrientation>PORTRAIT</overlayOrientation>
<layout>
<boxLayout>
<headerFooterLayout>
<name>layout</name>
</boxLayout>
<header>SelectedBulkMailInfosScore</header>
</headerFooterLayout>
</layout>
<children>
<scoreCardViewTemplate>
<name>SelectedBulkMailInfosScore</name>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>1b9e38a5-e921-48f7-ba04-71b758fa9ed3</name>
<entityField>currentRecipients</entityField>
</entityFieldLink>
<entityFieldLink>
<name>4578042c-9210-4dc4-870f-298a390aebd8</name>
<entityField>futureRecipients</entityField>
</entityFieldLink>
</fields>
</scoreCardViewTemplate>
<genericViewTemplate>
<name>Generic</name>
<editMode v="true" />
......
neonView/CampaignAddParticipantsEdit_view/CampaignAddParticipantsEdit_view.aod
+ 3
− 7
View file @ df2eb698
......@@ -30,22 +30,18 @@
<name>campaignDetail</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<informationField>campaignParticipantMessage</informationField>
<fields>
<entityFieldLink>
<name>4968ad35-3651-4654-a1b0-0e3d0fc6165d</name>
<name>e4fa5e06-cc8e-40c2-983c-371bd6b46958</name>
<entityField>CAMPAIGN_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>b9016725-1345-4526-88eb-2b05fb4089c8</name>
<name>f5cd3e7d-e2e3-401c-a314-6853ff269065</name>
<entityField>CAMPAIGNSTEP_ID</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
<name>1bfb0564-f81f-4c60-ae5b-1d9778a519ab</name>
<entityField>#ENTITY</entityField>
<view>campaignParticipantMessage_view</view>
</neonViewReference>
<actionsViewTemplate>
<name>ContinueActions</name>
<actions>
......
neonView/ExportTemplateSelectionEdit_view/ExportTemplateSelectionEdit_view.aod
+ 13
− 2
View file @ df2eb698
......@@ -5,11 +5,22 @@
<size>SMALL</size>
<overlayOrientation>PORTRAIT</overlayOrientation>
<layout>
<boxLayout>
<headerFooterLayout>
<name>layout</name>
</boxLayout>
<header>ExportedDataInfoScore</header>
</headerFooterLayout>
</layout>
<children>
<scoreCardViewTemplate>
<name>ExportedDataInfoScore</name>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>731880ab-e7fd-462b-ae21-431673f232cc</name>
<entityField>exportCount</entityField>
</entityFieldLink>
</fields>
</scoreCardViewTemplate>
<genericViewTemplate>
<name>generic</name>
<editMode v="true" />
......
neonView/SerialLetterAddRecipientsEdit_view/SerialLetterAddRecipientsEdit_view.aod
+ 17
− 13
View file @ df2eb698
......@@ -6,11 +6,26 @@
<isOverlay v="false" />
<overlayOrientation>PORTRAIT</overlayOrientation>
<layout>
<noneLayout>
<headerFooterLayout>
<name>layout</name>
</noneLayout>
<header>SelectedSerialLetterInfosScore</header>
</headerFooterLayout>
</layout>
<children>
<scoreCardViewTemplate>
<name>SelectedSerialLetterInfosScore</name>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>02bc3eb7-4ceb-4a54-ab56-9980b7653152</name>
<entityField>currentRecipients</entityField>
</entityFieldLink>
<entityFieldLink>
<name>5e91781a-d640-4096-a084-259c23bea825</name>
<entityField>futureRecipients</entityField>
</entityFieldLink>
</fields>
</scoreCardViewTemplate>
<genericViewTemplate>
<name>Generic</name>
<editMode v="true" />
......@@ -24,17 +39,6 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
<name>Message</name>
<hideLabels v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>ab256925-6375-4b7f-880d-039f6a68ccbc</name>
<entityField>recipientCountMessage</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<actionsViewTemplate>
<name>ContinueActions</name>
<actions>
......
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