Skip to content
Snippets Groups Projects
Commit f19433d8 authored by Sebastian Pongratz's avatar Sebastian Pongratz :ping_pong:
Browse files

Merge branch '#1063579-Beobachtungen' into 'master' 

#1063579 beobachtungen

See merge request xrm/basic!563
parents 958b96e9 6a4263a6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 242 additions and 51 deletions
.aditoprj/blueprints/CreateObservationActionBlueprint.xml 0 → 100644
+ 71
− 0
View file @ f19433d8
<?xml version="1.0" encoding="UTF-8" ?>
<blueprint name="Create ObserveActions">
<type>entityActionField</type>
<parameters>
</parameters>
<data>
<document name="context"><![CDATA[
<entity VERSION="1.3.17">
<entityFields>
<entityActionGroup>
<name>observeActionGroup</name>
<children>
<entityActionField>
<name>observe</name>
<title>Observe</title>
<onActionProcess>import("Observation_lib");
Observation.insertAction();</onActionProcess>
<isObjectAction v="true" />
<iconId>VAADIN:EYE</iconId>
<stateProcess>import("system.result");
import("Observation_lib");
import("system.neon");
if (!Observation.countObservations())
{
result.string(neon.COMPONENTSTATE_EDITABLE);
}
else
{
result.string(neon.COMPONENTSTATE_INVISIBLE);
}</stateProcess>
<titleProcess>import("system.result");
import("Observation_lib");
import("system.vars");
result.string(Observation.observeActionTitle(vars.get("$sys.selection")));
</titleProcess>
</entityActionField>
<entityActionField>
<name>cancelObservation</name>
<onActionProcess>import("Observation_lib");
Observation.cancelAction();</onActionProcess>
<iconId>VAADIN:EYE_SLASH</iconId>
<stateProcess>import("system.result");
import("Observation_lib");
import("system.neon");
if (Observation.countObservations())
{
result.string(neon.COMPONENTSTATE_EDITABLE);
}
else
{
result.string(neon.COMPONENTSTATE_INVISIBLE);
}</stateProcess>
<titleProcess>import("system.result");
import("system.vars");
import("Observation_lib");
result.string(Observation.cancelActionTitle(vars.get("$sys.selection")));
</titleProcess>
</entityActionField>
</children>
</entityActionGroup>
</entityFields>
</entity>
]]></document>
</data>
</blueprint>
.liquibase/Data_alias/basic/2021.0.0/Observation/CreateObservation.xml 0 → 100644
+ 36
− 0
View file @ f19433d8
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="s.pongratz" id="e7212711-2d85-4e5a-b215-0bbbeed9d538">
<createTable tableName="OBSERVATION">
<column name="OBSERVATIONID" type="CHAR(36)">
<constraints primaryKey="true" primaryKeyName="PK_OBSERVATION_OBSERVATIONID"/>
</column>
<column name="OBSERVATION_ID" type="CHAR(36)" />
<column name="OBSERVER" type="NVARCHAR(63)" >
<constraints nullable="false"/>
</column>
<column name="OBJECT_TYPE" type="NVARCHAR(80)">
<constraints nullable="false"/>
</column>
<column name="OBJECT_ID" type="VARCHAR(63)" />
<column name="OBJECT_FILTER" type="NCLOB" />
<column name="OBJECT_FIELD" type="NCLOB" />
<column name="NOTIFICATION_PRIO" type="NVARCHAR(36)" />
<column name="TRIGGEREVENTUPDATE" type="TINYINT"/>
<column name="TRIGGEREVENTDELETE" type="TINYINT"/>
<column name="TRIGGEREVENTINSERT" type="TINYINT"/>
<column name="USER_NEW" type="NVARCHAR(50)" />
<column name="DATE_NEW" type="DATETIME" />
<column name="USER_EDIT" type="NVARCHAR(50)" />
<column name="DATE_EDIT" type="DATETIME" />
</createTable>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.0.0/Observation/changelog.xml 0 → 100644
+ 6
− 0
View file @ f19433d8
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<include relativeToChangelogFile="true" file="CreateObservation.xml"/>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.0.0/changelog.xml
+ 2
− 1
View file @ f19433d8
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<include relativeToChangelogFile="true" file="Observation/changelog.xml"/>
<include relativeToChangelogFile="true" file="Classification/changelog.xml"/>
<include relativeToChangelogFile="true" file="Visit/changelog.xml"/>
<include relativeToChangelogFile="true" file="UpdateAddrFormats.xml"/>
<include relativeToChangelogFile="true" file="Address/addLatLonIndizes.xml"/>
</databaseChangeLog>
</databaseChangeLog>
\ No newline at end of file
entity/ActivityLink_entity/ActivityLink_entity.aod
+ 3
− 0
View file @ f19433d8
......@@ -108,6 +108,9 @@
<name>db</name>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<onDBInsert>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
<name>66f9eb3e-6f56-4731-a868-ffc9ffcce340</name>
......
entity/ActivityLink_entity/recordcontainers/db/onDBDelete.js 0 → 100644
+ 3
− 0
View file @ f19433d8
import("Workflow_lib");
WorkflowSignalSender.deleted();
\ No newline at end of file
entity/ActivityLink_entity/recordcontainers/db/onDBInsert.js 0 → 100644
+ 3
− 0
View file @ f19433d8
import("Workflow_lib");
WorkflowSignalSender.inserted();
\ No newline at end of file
entity/ActivityLink_entity/recordcontainers/db/onDBUpdate.js 0 → 100644
+ 3
− 0
View file @ f19433d8
import("Workflow_lib");
WorkflowSignalSender.updated();
\ No newline at end of file
entity/Activity_entity/Activity_entity.aod
+ 69
− 48
View file @ f19433d8
......@@ -339,21 +339,6 @@
<fieldName>TreeProviders</fieldName>
</dependency>
</entityConsumer>
<entityActionField>
<name>newActivity</name>
<title>New activity</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<iconId>VAADIN:HOURGLASS_END</iconId>
<tooltip>New activity</tooltip>
<tooltipProcess>%aditoprj%/entity/Activity_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityActionField>
<name>newTask</name>
<title>New task</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
<actionOrder v="1" />
<iconId>VAADIN:TASKS</iconId>
</entityActionField>
<entityParameter>
<name>ParentId_param</name>
<expose v="true" />
......@@ -415,13 +400,6 @@
<fieldName>AttributeRelations</fieldName>
</dependency>
</entityConsumer>
<entityActionField>
<name>newOffer</name>
<title>New offer</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
<actionOrder v="0" />
<iconId>VAADIN:CART</iconId>
</entityActionField>
<entityConsumer>
<name>Employees</name>
<dependency>
......@@ -489,19 +467,6 @@
<fieldName>LinkedAppointments</fieldName>
</dependency>
</entityConsumer>
<entityActionField>
<name>newSupportticket</name>
<title>New Support ticket</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CHAT</iconId>
</entityActionField>
<entityActionField>
<name>openAdminView</name>
<title>Open admin view</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Activity_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
<entityParameter>
<name>PresetDocuments_param</name>
<expose v="true" />
......@@ -589,19 +554,6 @@
<fieldName>LogHistoryProvider</fieldName>
</dependency>
</entityConsumer>
<entityActionGroup>
<name>MSTeamsActions</name>
<title>MS Teams</title>
<state>EDITABLE</state>
<stateProcess>%aditoprj%/entity/Activity_entity/entityfields/msteamsactions/stateProcess.js</stateProcess>
<children>
<entityActionField>
<name>importFromTeams</name>
<title>Import from Teams</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/msteamsactions/children/importfromteams/onActionProcess.js</onActionProcess>
</entityActionField>
</children>
</entityActionGroup>
<entityParameter>
<name>Category_param</name>
<expose v="true" />
......@@ -703,6 +655,75 @@
</entityParameter>
</children>
</entityProvider>
<entityActionGroup>
<name>MSTeamsActions</name>
<title>MS Teams</title>
<state>EDITABLE</state>
<stateProcess>%aditoprj%/entity/Activity_entity/entityfields/msteamsactions/stateProcess.js</stateProcess>
<children>
<entityActionField>
<name>importFromTeams</name>
<title>Import from Teams</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/msteamsactions/children/importfromteams/onActionProcess.js</onActionProcess>
</entityActionField>
</children>
</entityActionGroup>
<entityActionField>
<name>newActivity</name>
<title>New activity</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<iconId>VAADIN:HOURGLASS_END</iconId>
<tooltip>New activity</tooltip>
<tooltipProcess>%aditoprj%/entity/Activity_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityActionField>
<name>newTask</name>
<title>New task</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
<actionOrder v="1" />
<iconId>VAADIN:TASKS</iconId>
</entityActionField>
<entityActionField>
<name>newOffer</name>
<title>New offer</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
<actionOrder v="0" />
<iconId>VAADIN:CART</iconId>
</entityActionField>
<entityActionField>
<name>newSupportticket</name>
<title>New Support ticket</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CHAT</iconId>
</entityActionField>
<entityActionField>
<name>openAdminView</name>
<title>Open admin view</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Activity_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
<entityActionGroup>
<name>filterActions</name>
<children>
<entityActionField>
<name>cancelObservation</name>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/filteractions/children/cancelobservation/onActionProcess.js</onActionProcess>
<iconId>VAADIN:EYE_SLASH</iconId>
<stateProcess>%aditoprj%/entity/Activity_entity/entityfields/filteractions/children/cancelobservation/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Activity_entity/entityfields/filteractions/children/cancelobservation/titleProcess.js</titleProcess>
</entityActionField>
<entityActionField>
<name>observe</name>
<title>Observe</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/filteractions/children/observe/onActionProcess.js</onActionProcess>
<isObjectAction v="true" />
<iconId>VAADIN:EYE</iconId>
<stateProcess>%aditoprj%/entity/Activity_entity/entityfields/filteractions/children/observe/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Activity_entity/entityfields/filteractions/children/observe/titleProcess.js</titleProcess>
</entityActionField>
</children>
</entityActionGroup>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/Activity_entity/entityfields/filteractions/children/cancelobservation/onActionProcess.js 0 → 100644
+ 3
− 0
View file @ f19433d8
import("Observation_lib");
Observation.cancelAction();
\ No newline at end of file
entity/Activity_entity/entityfields/filteractions/children/cancelobservation/stateProcess.js 0 → 100644
+ 8
− 0
View file @ f19433d8
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
entity/Activity_entity/entityfields/filteractions/children/cancelobservation/titleProcess.js 0 → 100644
+ 5
− 0
View file @ f19433d8
import("system.result");
import("system.vars");
import("Observation_lib");
result.string(Observation.cancelActionTitle(vars.get("$sys.selection")));
\ No newline at end of file
entity/Activity_entity/entityfields/filteractions/children/observe/onActionProcess.js 0 → 100644
+ 3
− 0
View file @ f19433d8
import("Observation_lib");
Observation.insertAction();
\ No newline at end of file
entity/Activity_entity/entityfields/filteractions/children/observe/stateProcess.js 0 → 100644
+ 8
− 0
View file @ f19433d8
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
entity/Activity_entity/entityfields/filteractions/children/observe/titleProcess.js 0 → 100644
+ 5
− 0
View file @ f19433d8
import("system.result");
import("Observation_lib");
import("system.vars");
result.string(Observation.observeActionTitle(vars.get("$sys.selection")));
\ No newline at end of file
entity/Address_entity/Address_entity.aod
+ 1
− 0
View file @ f19433d8
......@@ -496,6 +496,7 @@
<orderClauseProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBInsert>%aditoprj%/entity/Address_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Address_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/Address_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
<name>6a0005cc-c64b-4044-9712-c9d00f02d7a8</name>
......
entity/Address_entity/recordcontainers/db/onDBDelete.js 0 → 100644
+ 3
− 0
View file @ f19433d8
import("Workflow_lib");
WorkflowSignalSender.deleted();
\ No newline at end of file
entity/Address_entity/recordcontainers/db/onDBInsert.js
+ 4
− 1
View file @ f19433d8
import("Workflow_lib");
import("Sql_lib");
import("system.logging");
import("KeywordRegistry_basic");
......@@ -59,4 +60,6 @@ if (addressLocation)
"LAT": addressLocation.lat,
"LON": addressLocation.lon
});
}
\ No newline at end of file
}
WorkflowSignalSender.inserted();
\ No newline at end of file
entity/Address_entity/recordcontainers/db/onDBUpdate.js
+ 4
− 1
View file @ f19433d8
import("Workflow_lib");
import("Sql_lib");
import("Location_lib");
import("Address_lib");
......@@ -28,4 +29,6 @@ if (isAddressChanged)
"LON": addressLocation.lon
});
}
}
\ No newline at end of file
}
WorkflowSignalSender.updated();
\ No newline at end of file
entity/AttributeRelation_entity/AttributeRelation_entity.aod
+ 2
− 0
View file @ f19433d8
......@@ -6,6 +6,7 @@
<title>Attribute</title>
<grantUpdateProcess>%aditoprj%/entity/AttributeRelation_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/AttributeRelation_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/AttributeRelation_entity/contentTitleProcess.js</contentTitleProcess>
<titlePlural>Attributes</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
......@@ -168,6 +169,7 @@
<children>
<entityParameter>
<name>GetTree_param</name>
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelations/children/gettree_param/valueProcess.js</valueProcess>
<expose v="false" />
</entityParameter>
</children>
......
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