Merge branch '1073891-beobachtungshotfix' into '2021.0.0'

1073891 beobachtungshotfix

See merge request xrm/basic!648

entity/Product_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js

+import("system.vars");
 import("system.result");
 import("Observation_lib");
 import("system.neon");
 
-if (Observation.countObservations())
-    result.string(neon.COMPONENTSTATE_EDITABLE);
-else
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
+result.string(Observation.actionState(vars.get("$sys.selection"), true));

entity/Product_entity/entityfields/observeactiongroup/children/observe/stateProcess.js

+import("system.vars");
 import("system.result");
 import("Observation_lib");
 import("system.neon");
 
-if (!Observation.countObservations())
-    result.string(neon.COMPONENTSTATE_EDITABLE);
-else
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
+result.string(Observation.actionState(vars.get("$sys.selection")));

entity/Salesproject_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js

+import("system.vars");
 import("system.result");
 import("Observation_lib");
 import("system.neon");
 
-if (Observation.countObservations())
-    result.string(neon.COMPONENTSTATE_EDITABLE);
-else
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
+result.string(Observation.actionState(vars.get("$sys.selection"), true));
\ No newline at end of file

entity/Salesproject_entity/entityfields/observeactiongroup/children/observe/stateProcess.js

+import("system.vars");
 import("system.result");
 import("Observation_lib");
 import("system.neon");
 
-if (!Observation.countObservations())
-    result.string(neon.COMPONENTSTATE_EDITABLE);
-else
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
+result.string(Observation.actionState(vars.get("$sys.selection")));

entity/SupportTicket_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js

+import("system.vars");
 import("system.result");
 import("Observation_lib");
 import("system.neon");
 
-if (Observation.countObservations())
-    result.string(neon.COMPONENTSTATE_EDITABLE);
-else
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
+result.string(Observation.actionState(vars.get("$sys.selection"), true));

entity/SupportTicket_entity/entityfields/observeactiongroup/children/observe/stateProcess.js

+import("system.vars");
 import("system.result");
 import("Observation_lib");
 import("system.neon");
 
-if (!Observation.countObservations())
-    result.string(neon.COMPONENTSTATE_EDITABLE);
-else
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
+result.string(Observation.actionState(vars.get("$sys.selection")));
\ No newline at end of file

entity/Task_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js

+import("system.vars");
 import("system.result");
 import("Observation_lib");
 import("system.neon");
 
-if (Observation.countObservations())
-    result.string(neon.COMPONENTSTATE_EDITABLE);
-else
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
+result.string(Observation.actionState(vars.get("$sys.selection"), true));
\ No newline at end of file

entity/Task_entity/entityfields/observeactiongroup/children/observe/stateProcess.js

+import("system.vars");
 import("system.result");
 import("Observation_lib");
 import("system.neon");
 
-if (!Observation.countObservations())
-    result.string(neon.COMPONENTSTATE_EDITABLE);
-else
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
+result.string(Observation.actionState(vars.get("$sys.selection")));

neonContext/Observation/Observation.aod

-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
-  <name>Observation</name>
-  <title>Observation</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <icon>VAADIN:EYE</icon>
-  <filterView>ObservationFilter_view</filterView>
-  <editView>ObservationEdit_view</editView>
-  <previewView>ObservationPreview_view</previewView>
-  <entity>Observation_entity</entity>
-  <references>
-    <neonViewReference>
-      <name>081e645d-ede7-4987-891c-725e2300c7a0</name>
-      <view>ObservationFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>381da87e-006b-4fd6-b2b2-18e53d675928</name>
-      <view>ObservationEdit_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>8e1417a2-f172-451f-9e76-81b852abcaa1</name>
-      <view>ObservationPreview_view</view>
-    </neonViewReference>
-  </references>
-</neonContext>

preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod

@@ -148,5 +148,10 @@
       <name>nominatim.resultLimit</name>
       <description>Amount of rows returned by the address search. Default is 10, maximum is 50.</description>
     </customIntegerProperty>
+    <customBooleanProperty>
+      <name>observation.isEnabled</name>
+      <description>Whether the observations are enabled or not</description>
+      <property v="false" />
+    </customBooleanProperty>
   </customProperties>
 </preferences>

process/Observation_lib/process.js

+import("system.neon");
 import("KeywordRegistry_basic");
 import("system.logging");
 import("system.text");
@@ -535,11 +536,11 @@ Observation.observeActionTitle = function (pUIDs)
  * 
  * @return {Int} Count of records
  */
-Observation.countObservations = function () 
+Observation.countObservations = function (pSelectedUIDs) 
 {
     let contextID = ContextUtils.getCurrentContextId();
     let observer = EmployeeUtils.getCurrentUserId();
-    let selectedUIDs = vars.get("$sys.selection").filter(function (el) {
+    let selectedUIDs = pSelectedUIDs.filter(function (el) {
         return el;
     });
     let rowCount =  newSelect("COUNT(*)")
@@ -555,6 +556,33 @@ Observation.countObservations = function ()
     return parseInt(rowCount.cell());
 }
 
+/**
+ * Returns the state for the Observation Actions
+ * 
+ * @param {Void} [pSelectedUIDs] The IDs which were selected in the filter view
+ * @param {Void} [pIsCancelAction] true when the fucntion is called in the CancelAction
+ * @return {Void}
+ */
+Observation.actionState = function (pSelectedUIDs, pIsCancelAction)
+{
+    let isEnabled = project.getPreferenceValue("custom.observation.isEnabled", "false");
+    if (isEnabled == "false")
+    {
+        return neon.COMPONENTSTATE_INVISIBLE;
+    }
+    
+    let cond = pIsCancelAction ? Observation.countObservations(pSelectedUIDs) : !Observation.countObservations(pSelectedUIDs);
+    
+    if (cond)
+    {
+        return neon.COMPONENTSTATE_EDITABLE;
+    }
+    else 
+    {
+        return neon.COMPONENTSTATE_INVISIBLE;
+    }
+}
+
 /**
  * Returns an object with the entity and filter. 
  * If filter or entity are not set, they are set to an empty filter and the current entity.

process/workflowExtension_serverProcess/process.js

+import("system.project");
 import("Context_lib");
 import("Classification_lib");
 import("Workflow_lib");
@@ -10,6 +11,9 @@ var entityName = ContextUtils.getEntity(localVariables["targetContext"]);
 var rowData = JSON.parse(localVariables[WorkflowVariables.ROWDATA()]);
 var changedRows = JSON.parse(localVariables[WorkflowVariables.CHANGED_ROWS()]);
 
-Observation.checkObservation(JSON.parse(vars.get("$local.variablesWorkflow")));
+if (project.getPreferenceValue("custom.observation.isEnabled", false) == "true")
+{
+    Observation.checkObservation(localVariables);
+}
 
 ClassificationUtils.setClassificationStorageDatasetsOutdated([targetId], entityName, rowData, changedRows);