merged origin/2021.0.0 into 2021.0

.aditoprj/blueprints/CreateObservationActionBlueprint.xml

@@ -18,18 +18,12 @@
 Observation.insertAction();</onActionProcess>
 								<isObjectAction v="true" />
 								<iconId>VAADIN:EYE</iconId>
-								<stateProcess>import("system.result");
+								<stateProcess>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);
-}</stateProcess>
+result.string(Observation.actionState(vars.get("$sys.selection")));</stateProcess>
 								<titleProcess>import("system.result");
 import("Observation_lib");
 import("system.vars");
@@ -43,18 +37,12 @@ result.string(Observation.observeActionTitle(vars.get("$sys.selection")));
 
 Observation.cancelAction();</onActionProcess>
 								<iconId>VAADIN:EYE_SLASH</iconId>
-								<stateProcess>import("system.result");
+								<stateProcess>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);
-}</stateProcess>
+result.string(Observation.actionState(vars.get("$sys.selection"), true));</stateProcess>
 								<titleProcess>import("system.result");
 import("system.vars");
 import("Observation_lib");

.liquibase/Data_alias/changelog.xml

@@ -22,5 +22,5 @@
     <include relativeToChangelogFile="true" file="basic/2021.0.0/changelog.xml"/>
 
     <!--enable this only when you definetly want to overwrite the existing data with demo records:-->
-    <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
+    <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
 </databaseChangeLog>
\ No newline at end of file

.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_collector_data.xml

@@ -3,7 +3,7 @@
     <changeSet author="j.hoermann" id="4fe7309e-e131-4f3d-8e65-fb399fcd7090">
         <createTable tableName="ASYS_COLLECTOR_DATA">
             <column name="DATAID" type="CHAR(63)">
-                <constraints primaryKey="true" primaryKeyName="PK_ASYS_COLLECTOR_DATA_ID"/>
+                <constraints nullable="false"/>
             </column>
             <column name="SHORTINFO" type="VARCHAR(255)"/>
             <column name="TIMECOLLECTED" type="DATETIME"/>
@@ -13,5 +13,8 @@
         <createIndex tableName="ASYS_COLLECTOR_DATA" indexName="IDX_COLLECTORDATA_TIMECOLLECT">
             <column name="TIMECOLLECTED"/>
         </createIndex>
+        <createIndex tableName="ASYS_COLLECTOR_DATA" indexName="IDX_COLLECTORDATA_DATAID">
+            <column name="DATAID"/>
+        </createIndex>
     </changeSet>
 </databaseChangeLog>
\ No newline at end of file

entity/Activity_entity/entityfields/filteractions/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/Activity_entity/entityfields/filteractions/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/Campaign_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/Campaign_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/Contract_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/Contract_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/Employee_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/Employee_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/Leadimport_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/Leadimport_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/Observation_entity/documentation.adoc

@@ -14,3 +14,8 @@ inserted, updated or deleted.
 * The entity had to have a content Title
 * The entity had to be customizing in the Blacklist_param of the Context Consumer if its not an dependency. Otherwise it had to be customizing in the Dependency_lib with the "isObservable" option
 * The entityfields which should not be displayed must also be customized
+
+=== Enable Observation
+
+* Enable the custom field observation.isEnabled in the _____PREFERENCES_PROJECT
+* Create the Observation Context and add the Entity, the Views (ObservationEdit_view, ObservationFilter_view, ObservationPreview_view), the Icon (VAADIN:EYE) and the Tile "Observation" to it

entity/Offer_entity/entityfields/chosenaddress/valueProcess.js

@@ -3,7 +3,9 @@ import("system.result");
 import("system.neon");
 import("system.vars");
 
-if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT))
+//the value of this field can also be changed by CONTACT_ID.onValueChange
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
 {
     var defaultAddressId = ContactUtils.getDefaultAddressId(vars.get("$field.CONTACT_ID"));
     if (defaultAddressId)

entity/Offer_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/Offer_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/Order_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/Order_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/Organisation_entity/entityfields/filterviewactiongroup/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));