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
Showing
with 131 additions and 2 deletions
import("Workflow_lib");
WorkflowSignalSender.inserted();
\ No newline at end of file
import("Workflow_lib");
WorkflowSignalSender.updated();
\ No newline at end of file
......@@ -153,6 +153,12 @@
<fieldName>Contexts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>f69007c7-d495-42d2-9a12-6426c24771a4</name>
<entityName>Observation_entity</entityName>
<fieldName>Contexts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityProvider>
......
......@@ -15,6 +15,27 @@
<titlePlural>Contracts</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityActionGroup>
<name>observeActionGroup</name>
<children>
<entityActionField>
<name>observe</name>
<title>Observe</title>
<onActionProcess>%aditoprj%/entity/Contract_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
<isObjectAction v="true" />
<iconId>VAADIN:EYE</iconId>
<stateProcess>%aditoprj%/entity/Contract_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Contract_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
</entityActionField>
<entityActionField>
<name>cancelObservation</name>
<onActionProcess>%aditoprj%/entity/Contract_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
<iconId>VAADIN:EYE_SLASH</iconId>
<stateProcess>%aditoprj%/entity/Contract_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Contract_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
</entityActionField>
</children>
</entityActionGroup>
<entityField>
<name>CONTRACTCODE</name>
<documentation>%aditoprj%/entity/Contract_entity/entityfields/contractcode/documentation.adoc</documentation>
......
import("Observation_lib");
Observation.cancelAction();
\ No newline at end of file
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
import("system.result");
import("system.vars");
import("Observation_lib");
result.string(Observation.cancelActionTitle(vars.get("$sys.selection")));
\ No newline at end of file
import("Observation_lib");
Observation.insertAction();
\ No newline at end of file
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
import("system.result");
import("Observation_lib");
import("system.vars");
result.string(Observation.observeActionTitle(vars.get("$sys.selection")));
\ No newline at end of file
......@@ -5,6 +5,7 @@
<documentation>%aditoprj%/entity/Document_entity/documentation.adoc</documentation>
<title>Document</title>
<grantCreateProcess>%aditoprj%/entity/Document_entity/grantCreateProcess.js</grantCreateProcess>
<contentTitleProcess>%aditoprj%/entity/Document_entity/contentTitleProcess.js</contentTitleProcess>
<iconId>VAADIN:FILE</iconId>
<titlePlural>Documents</titlePlural>
<recordContainer>jdito</recordContainer>
......@@ -393,6 +394,10 @@
<name>MSTTeamId_param</name>
<expose v="true" />
</entityParameter>
<entityField>
<name>assignmentRowID</name>
<valueProcess>%aditoprj%/entity/Document_entity/entityfields/assignmentrowid/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
......@@ -427,6 +432,9 @@
<jDitoRecordFieldMapping>
<name>KEYWORD.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>assignmentRowID.value</name>
</jDitoRecordFieldMapping>
</recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
......
import("system.vars");
import("system.result");
result.string(vars.get("$field.NAME"));
\ No newline at end of file
import("system.vars");
import("system.result");
if (!vars.get("$this.value"))
result.string(vars.get("$param.AssignmentRowId_param"));
\ No newline at end of file
......@@ -30,7 +30,7 @@ if(vars.exists("$param.AssignmentTable_param") &&
var previewAvatar = metadata[i].preview || "VAADIN:FILE";
documents.push( [metadata[i].id, metadata[i].filename, metadata[i].size,
metadata[i].edit, previewAvatar, metadata[i].mimetype,
metadata[i].description, metadata[i].keyword]);
metadata[i].description, metadata[i].keyword, assignmentRowId]);
}
result.object(documents);
......
import("Workflow_lib");
import("Document_lib");
DocumentUtil.deleteCurrentDocument();
WorkflowSignalSender.deleted();
import("Workflow_lib");
import("system.db");
import("system.vars");
import("Document_lib");
......@@ -21,3 +22,5 @@ if(bindata != '' && filename != ''){
bindata, filename, description, keyword, alias, id);
}
WorkflowSignalSender.inserted();
\ No newline at end of file
import("Workflow_lib");
import("system.vars");
import("system.db");
import("Document_lib");
......@@ -22,4 +23,6 @@ if(vars.get("$field.IS_MAIN_DOCUMENT") == '1') {
if(bindata != '')
db.updateBinary(id, parentId, bindata, fileName, description, keyword, alias);
else
db.updateBinaryMetadata(id, parentId, fileName, description, keyword, alias);
\ No newline at end of file
db.updateBinaryMetadata(id, parentId, fileName, description, keyword, alias);
WorkflowSignalSender.updated();
\ No newline at end of file
......@@ -14,6 +14,27 @@
<titlePlural>Employees</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityActionGroup>
<name>observeActionGroup</name>
<children>
<entityActionField>
<name>observe</name>
<title>Observe</title>
<onActionProcess>%aditoprj%/entity/Employee_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
<isObjectAction v="true" />
<iconId>VAADIN:EYE</iconId>
<stateProcess>%aditoprj%/entity/Employee_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Employee_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
</entityActionField>
<entityActionField>
<name>cancelObservation</name>
<onActionProcess>%aditoprj%/entity/Employee_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
<iconId>VAADIN:EYE_SLASH</iconId>
<stateProcess>%aditoprj%/entity/Employee_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Employee_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
</entityActionField>
</children>
</entityActionGroup>
<entityProvider>
<name>#PROVIDER</name>
<lookupIdfield>CONTACT_ID</lookupIdfield>
......@@ -337,6 +358,12 @@
<fieldName>Employees</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>c83ebe7a-5a3b-49ed-b40c-d667bb72f268</name>
<entityName>Observation_entity</entityName>
<fieldName>Ussers</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityProvider>
......
import("Observation_lib");
Observation.cancelAction();
\ No newline at end of file
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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment