From 0b1e007587e2f389e4bba036445b8d997f1f24f9 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Tue, 2 Mar 2021 15:50:06 +0100
Subject: [PATCH] =?UTF-8?q?#1074915-ZentraleBeobachtungsaction=20Ver=C3=A4?=
=?UTF-8?q?nderung=20der=20Gruppierung=20der=20Actions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Organisation_entity.aod | 37 +++++++++++--------
.../cancelobservation/onActionProcess.js | 0
.../cancelobservation/stateProcess.js | 0
.../cancelobservation/titleProcess.js | 0
.../children/observe/onActionProcess.js | 0
.../children/observe/stateProcess.js | 0
.../children/observe/titleProcess.js | 0
entity/Person_entity/Person_entity.aod | 37 +++++++++++--------
.../cancelobservation/onActionProcess.js | 0
.../cancelobservation/stateProcess.js | 2 +-
.../cancelobservation/titleProcess.js | 0
.../children/observe/onActionProcess.js | 0
.../children/observe/stateProcess.js | 2 +-
.../children/observe/titleProcess.js | 0
.../OrganisationFilter_view.aod | 10 +++--
.../PersonFilter_view/PersonFilter_view.aod | 10 +++--
16 files changed, 56 insertions(+), 42 deletions(-)
rename entity/Organisation_entity/entityfields/{filterviewactiongroup => observeactiongroup}/children/cancelobservation/onActionProcess.js (100%)
rename entity/{Person_entity/entityfields/filterviewactiongroup => Organisation_entity/entityfields/observeactiongroup}/children/cancelobservation/stateProcess.js (100%)
rename entity/Organisation_entity/entityfields/{filterviewactiongroup => observeactiongroup}/children/cancelobservation/titleProcess.js (100%)
rename entity/Organisation_entity/entityfields/{filterviewactiongroup => observeactiongroup}/children/observe/onActionProcess.js (100%)
rename entity/Organisation_entity/entityfields/{filterviewactiongroup => observeactiongroup}/children/observe/stateProcess.js (100%)
rename entity/Organisation_entity/entityfields/{filterviewactiongroup => observeactiongroup}/children/observe/titleProcess.js (100%)
rename entity/Person_entity/entityfields/{filterviewactiongroup => observeactiongroup}/children/cancelobservation/onActionProcess.js (100%)
rename entity/{Organisation_entity/entityfields/filterviewactiongroup => Person_entity/entityfields/observeactiongroup}/children/cancelobservation/stateProcess.js (94%)
rename entity/Person_entity/entityfields/{filterviewactiongroup => observeactiongroup}/children/cancelobservation/titleProcess.js (100%)
rename entity/Person_entity/entityfields/{filterviewactiongroup => observeactiongroup}/children/observe/onActionProcess.js (100%)
rename entity/Person_entity/entityfields/{filterviewactiongroup => observeactiongroup}/children/observe/stateProcess.js (97%)
rename entity/Person_entity/entityfields/{filterviewactiongroup => observeactiongroup}/children/observe/titleProcess.js (100%)
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index f9d3e5f363..a48ba1eec2 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -17,6 +17,27 @@
<titlePlural>Companies</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
+ <entityActionGroup>
+ <name>observeActionGroup</name>
+ <children>
+ <entityActionField>
+ <name>observe</name>
+ <title>Observe</title>
+ <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
+ <isObjectAction v="true" />
+ <iconId>VAADIN:EYE</iconId>
+ <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>cancelObservation</name>
+ <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:EYE_SLASH</iconId>
+ <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
<entityField>
<name>CUSTOMERCODE</name>
<title>Customercode</title>
@@ -1406,22 +1427,6 @@
<title>Serial Actions</title>
<iconId>NEON:GROUP_APPOINTMENT</iconId>
<children>
- <entityActionField>
- <name>cancelObservation</name>
- <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:EYE_SLASH</iconId>
- <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
- </entityActionField>
- <entityActionField>
- <name>observe</name>
- <title>Observe</title>
- <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/observe/onActionProcess.js</onActionProcess>
- <isObjectAction v="true" />
- <iconId>VAADIN:EYE</iconId>
- <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/observe/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/observe/titleProcess.js</titleProcess>
- </entityActionField>
<entityActionField>
<name>addToCampaignFromTable</name>
<title>Add to Campaign</title>
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/cancelobservation/onActionProcess.js b/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/filterviewactiongroup/children/cancelobservation/onActionProcess.js
rename to entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/cancelobservation/stateProcess.js b/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/filterviewactiongroup/children/cancelobservation/stateProcess.js
rename to entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/cancelobservation/titleProcess.js b/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/filterviewactiongroup/children/cancelobservation/titleProcess.js
rename to entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/observe/onActionProcess.js b/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/filterviewactiongroup/children/observe/onActionProcess.js
rename to entity/Organisation_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/observe/stateProcess.js b/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/stateProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/filterviewactiongroup/children/observe/stateProcess.js
rename to entity/Organisation_entity/entityfields/observeactiongroup/children/observe/stateProcess.js
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/observe/titleProcess.js b/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/titleProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/filterviewactiongroup/children/observe/titleProcess.js
rename to entity/Organisation_entity/entityfields/observeactiongroup/children/observe/titleProcess.js
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index f78d77df12..64bb15fc56 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -21,6 +21,27 @@
<titlePlural>Contacts</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
+ <entityActionGroup>
+ <name>observeActionGroup</name>
+ <children>
+ <entityActionField>
+ <name>observe</name>
+ <title>Observe</title>
+ <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
+ <isObjectAction v="true" />
+ <iconId>VAADIN:EYE</iconId>
+ <stateProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>cancelObservation</name>
+ <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:EYE_SLASH</iconId>
+ <stateProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
<entityField>
<name>DATEOFBIRTH</name>
<title>Date of birth</title>
@@ -1358,22 +1379,6 @@
<isObjectAction v="false" />
<iconId>VAADIN:ENVELOPES</iconId>
</entityActionField>
- <entityActionField>
- <name>observe</name>
- <title>Observe</title>
- <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/observe/onActionProcess.js</onActionProcess>
- <isObjectAction v="true" />
- <iconId>VAADIN:EYE</iconId>
- <stateProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/observe/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/observe/titleProcess.js</titleProcess>
- </entityActionField>
- <entityActionField>
- <name>cancelObservation</name>
- <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:EYE_SLASH</iconId>
- <stateProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
- </entityActionField>
<entityActionField>
<name>addToContactSync</name>
<title>add Contact to Sync</title>
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/cancelobservation/onActionProcess.js b/entity/Person_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/filterviewactiongroup/children/cancelobservation/onActionProcess.js
rename to entity/Person_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/cancelobservation/stateProcess.js b/entity/Person_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js
similarity index 94%
rename from entity/Organisation_entity/entityfields/filterviewactiongroup/children/cancelobservation/stateProcess.js
rename to entity/Person_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js
index 7a8ef81634..6ed1e38413 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/cancelobservation/stateProcess.js
+++ b/entity/Person_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js
@@ -3,4 +3,4 @@ import("system.result");
import("Observation_lib");
import("system.neon");
-result.string(Observation.actionState(vars.get("$sys.selection"), true));
+result.string(Observation.actionState(vars.get("$sys.selection"), true));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/cancelobservation/titleProcess.js b/entity/Person_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/filterviewactiongroup/children/cancelobservation/titleProcess.js
rename to entity/Person_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/observe/onActionProcess.js b/entity/Person_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/filterviewactiongroup/children/observe/onActionProcess.js
rename to entity/Person_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/observe/stateProcess.js b/entity/Person_entity/entityfields/observeactiongroup/children/observe/stateProcess.js
similarity index 97%
rename from entity/Person_entity/entityfields/filterviewactiongroup/children/observe/stateProcess.js
rename to entity/Person_entity/entityfields/observeactiongroup/children/observe/stateProcess.js
index 8b0b88a4ad..495784da27 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/observe/stateProcess.js
+++ b/entity/Person_entity/entityfields/observeactiongroup/children/observe/stateProcess.js
@@ -3,4 +3,4 @@ import("system.result");
import("Observation_lib");
import("system.neon");
-result.string(Observation.actionState(vars.get("$sys.selection")));
+result.string(Observation.actionState(vars.get("$sys.selection")));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/observe/titleProcess.js b/entity/Person_entity/entityfields/observeactiongroup/children/observe/titleProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/filterviewactiongroup/children/observe/titleProcess.js
rename to entity/Person_entity/entityfields/observeactiongroup/children/observe/titleProcess.js
diff --git a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
index 7e177f5064..d0a3e39a28 100644
--- a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
+++ b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
@@ -51,8 +51,9 @@
<name>Organisations</name>
<subtitleField>CUSTOMERCODE_DISPLAY_fieldGroup</subtitleField>
<entityField>#ENTITY</entityField>
- <favoriteActionGroup1>filterViewActionGroup</favoriteActionGroup1>
- <favoriteActionGroup2>DuplicateActions</favoriteActionGroup2>
+ <favoriteActionGroup1>observeActionGroup</favoriteActionGroup1>
+ <favoriteActionGroup2>filterViewActionGroup</favoriteActionGroup2>
+ <favoriteActionGroup3>DuplicateActions</favoriteActionGroup3>
<linkedColumns>
<element>NAME</element>
</linkedColumns>
@@ -99,8 +100,9 @@
<treeTableViewTemplate>
<name>Treetable</name>
<entityField>#ENTITY</entityField>
- <favoriteActionGroup1>filterViewActionGroup</favoriteActionGroup1>
- <favoriteActionGroup2>DuplicateActions</favoriteActionGroup2>
+ <favoriteActionGroup1>observeActionGroup</favoriteActionGroup1>
+ <favoriteActionGroup2>filterViewActionGroup</favoriteActionGroup2>
+ <favoriteActionGroup3>DuplicateActions</favoriteActionGroup3>
<linkedColumns>
<element>NAME</element>
</linkedColumns>
diff --git a/neonView/PersonFilter_view/PersonFilter_view.aod b/neonView/PersonFilter_view/PersonFilter_view.aod
index 5b5773e28c..c892033123 100644
--- a/neonView/PersonFilter_view/PersonFilter_view.aod
+++ b/neonView/PersonFilter_view/PersonFilter_view.aod
@@ -55,8 +55,9 @@
<subtitleField>LANGUAGE</subtitleField>
<descriptionField>ORGANISATION_CONTACTID</descriptionField>
<entityField>#ENTITY</entityField>
- <favoriteActionGroup1>filterViewActionGroup</favoriteActionGroup1>
- <favoriteActionGroup2>DuplicateActions</favoriteActionGroup2>
+ <favoriteActionGroup1>observeActionGroup</favoriteActionGroup1>
+ <favoriteActionGroup2>filterViewActionGroup</favoriteActionGroup2>
+ <favoriteActionGroup3>DuplicateActions</favoriteActionGroup3>
<linkedColumns>
<element>FIRSTNAME</element>
<element>LASTNAME</element>
@@ -104,8 +105,9 @@
<treeTableViewTemplate>
<name>Treetable</name>
<entityField>#ENTITY</entityField>
- <favoriteActionGroup1>filterViewActionGroup</favoriteActionGroup1>
- <favoriteActionGroup2>DuplicateActions</favoriteActionGroup2>
+ <favoriteActionGroup1>observeActionGroup</favoriteActionGroup1>
+ <favoriteActionGroup2>filterViewActionGroup</favoriteActionGroup2>
+ <favoriteActionGroup3>DuplicateActions</favoriteActionGroup3>
<linkedColumns>
<element>FIRSTNAME</element>
<element>LASTNAME</element>
--
GitLab