Skip to content
Snippets Groups Projects
Commit 89265954 authored by Maximilian Schröger's avatar Maximilian Schröger
Browse files

Merge branch 'Vertragsmanagement' 

# Conflicts:
#	entity/Pers_entity/Pers_entity.aod
#	process/Keyword_lib/process.js
parents 0d8d9e16 4b386b2e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 534 additions and 0 deletions
aliasDefinition/Data_alias/Data_alias.aod
+ 201
− 0
View file @ 89265954
......@@ -1176,6 +1176,207 @@
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
<name>CONTRACT</name>
<dbName></dbName>
<idColumn>CONTRACTID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<title></title>
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
<auditMode v="0" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
<syncIds></syncIds>
</auditSyncConfig>
<entityFields>
<entityFieldDb>
<name>CONTRACTDUE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="29" />
<scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>PAYMENT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>CONTRACTSTATUS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="29" />
<scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>CONTRACTEND</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="29" />
<scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>USER_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>CONTRACTCODE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="30" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>CONTRACTID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>CONTRACTTYPE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="29" />
<scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>RELATION_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>USER_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>CONTRACTSTART</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="29" />
<scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>REMARK</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
</entities>
</entityGroup>
</aliasDefDb>
......
application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+ 1
− 0
View file @ 89265954
......@@ -12,6 +12,7 @@
<node name="Org_context" kind="10077" />
<node name="Pers_context" kind="10077" />
<node name="History_context" kind="10077" />
<node name="Contract_context" kind="10077" />
<node name="INTERNAL_ADMINISTRATOR" kind="159" />
</node>
</node>
......
entity/Contract_entity/Contract_entity.aod 0 → 100644
+ 195
− 0
View file @ 89265954
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.3">
<name>Contract_entity</name>
<title>Contract</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Contract_entity/conditionProcess.js</conditionProcess>
<recordContainerType>DB</recordContainerType>
<caption>Contract</caption>
<entityFields>
<entityField>
<name>CONTRACTCODE</name>
<tableName>CONTRACT</tableName>
<columnName>CONTRACTCODE</columnName>
<caption>Vertragsnummer</caption>
</entityField>
<entityField>
<name>CONTRACTDUE</name>
<tableName>CONTRACT</tableName>
<columnName>CONTRACTDUE</columnName>
<caption>nächste Fälligkeit</caption>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractdue/onValidation.js</onValidation>
</entityField>
<entityField>
<name>CONTRACTEND</name>
<tableName>CONTRACT</tableName>
<columnName>CONTRACTEND</columnName>
<caption>Vertragsende</caption>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractend/onValidation.js</onValidation>
<onValueChange>%aditoprj%/entity/Contract_entity/entityfields/contractend/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>CONTRACTID</name>
<tableName>CONTRACT</tableName>
<columnName>CONTRACTID</columnName>
</entityField>
<entityField>
<name>CONTRACTSTART</name>
<tableName>CONTRACT</tableName>
<columnName>CONTRACTSTART</columnName>
<caption>Vertragsbeginn</caption>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractstart/onValidation.js</onValidation>
</entityField>
<entityField>
<name>CONTRACTSTATUS</name>
<tableName>CONTRACT</tableName>
<columnName>CONTRACTSTATUS</columnName>
<caption>Status</caption>
<possibleItemsProcess>%aditoprj%/entity/Contract_entity/entityfields/contractstatus/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>CONTRACTTYPE</name>
<tableName>CONTRACT</tableName>
<columnName>CONTRACTTYPE</columnName>
<caption>Vertragsart</caption>
<possibleItemsProcess>%aditoprj%/entity/Contract_entity/entityfields/contracttype/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
<tableName>CONTRACT</tableName>
<columnName>DATE_EDIT</columnName>
<contentType>DATE</contentType>
<outputFormat>yyyy-MM-dd&amp;apos;T&amp;apos;HH:mm:ssZ</outputFormat>
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
<tableName>CONTRACT</tableName>
<columnName>DATE_NEW</columnName>
<contentType>DATE</contentType>
<outputFormat>yyyy-MM-dd&amp;apos;T&amp;apos;HH:mm:ssZ</outputFormat>
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PAYMENT</name>
<tableName>CONTRACT</tableName>
<columnName>PAYMENT</columnName>
<caption>Zahlweise</caption>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Contract_entity/entityfields/payment/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>RELATION_ID</name>
<tableName>CONTRACT</tableName>
<columnName>RELATION_ID</columnName>
<caption>Person / Firma</caption>
<linkedContextProcess>%aditoprj%/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
<outgoingField>ContractOrg_dfo</outgoingField>
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/relation_id/valueProcess.js</valueProcess>
<valueMappingProcess>%aditoprj%/entity/Contract_entity/entityfields/relation_id/valueMappingProcess.js</valueMappingProcess>
<fieldIdProcess>%aditoprj%/entity/Contract_entity/entityfields/relation_id/fieldIdProcess.js</fieldIdProcess>
</entityField>
<entityField>
<name>REMARK</name>
<tableName>CONTRACT</tableName>
<columnName>REMARK</columnName>
<caption>Beschreibung</caption>
<contentType>LONG_TEXT</contentType>
</entityField>
<entityField>
<name>USER_EDIT</name>
<tableName>CONTRACT</tableName>
<columnName>USER_EDIT</columnName>
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_NEW</name>
<tableName>CONTRACT</tableName>
<columnName>USER_NEW</columnName>
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityIncomingField>
<name>PersContract_dfi</name>
<fieldType>DEPENDENCY_IN</fieldType>
<dependencies>
<entityDependency>
<name>2146b082-6377-4b34-be6b-3dad18885614</name>
<entityName>Pers_entity</entityName>
<fieldName>PersContract_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
</dependencies>
</entityIncomingField>
<entityIncomingField>
<name>OrgContract_dfi</name>
<fieldType>DEPENDENCY_IN</fieldType>
<dependencies>
<entityDependency>
<name>6d7c7166-84b4-4da2-9a48-cc1e390ac987</name>
<entityName>Org_entity</entityName>
<fieldName>OrgContract_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
</dependencies>
</entityIncomingField>
<entityParameter>
<name>RelId_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityField>
<name>IMAGE</name>
<contentType>IMAGE</contentType>
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/image/valueProcess.js</valueProcess>
</entityField>
<entityFieldGroup>
<name>CONTRACTCODE_DISPLAY_fieldGroup</name>
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js</valueProcess>
<description>FIELDGROUP</description>
<fields>
<element>CONTRACTTYPE</element>
<element>CONTRACTCODE</element>
</fields>
</entityFieldGroup>
<entityOutgoingField>
<name>ContractHistory_dfo</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>History_entity</entityName>
<fieldName>ContractHistory_dfi</fieldName>
</dependency>
<children>
<entityParameter>
<name>RowId_param</name>
<code>%aditoprj%/entity/Contract_entity/entityfields/contracthistory_dfo/children/rowid_param/code.js</code>
</entityParameter>
</children>
</entityOutgoingField>
<entityOutgoingField>
<name>ContractOrg_dfo</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Org_entity</entityName>
<fieldName>Org_dfi</fieldName>
</dependency>
</entityOutgoingField>
</entityFields>
<linkInformation>
<linkInformation>
<name>feb748e4-0664-455d-be48-dde37a391115</name>
<tableName>CONTRACT</tableName>
<primaryKey>CONTRACTID</primaryKey>
<isUIDTable v="true" />
</linkInformation>
</linkInformation>
</entity>
entity/Contract_entity/conditionProcess.js 0 → 100644
+ 7
− 0
View file @ 89265954
import("system.result");
import("system.vars");
if(vars.exists("$param.RelId_param") && vars.get("$param.RelId_param") != null)
result.string("CONTRACT.RELATION_ID = ('" + vars.getString("$param.RelId_param") + "')");
else
result.string("");
\ No newline at end of file
entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js 0 → 100644
+ 10
− 0
View file @ 89265954
import("system.vars");
import("system.result");
import("Keyword_lib");
var kwdUtils = new KeywordUtils();
var cType = vars.get("$field.CONTRACTTYPE");
var cCode = vars.get("$field.CONTRACTCODE");
result.string(kwdUtils.getViewValue("CONTRACT.CONTRACTTYPE", cType) + " : " + cCode);
\ No newline at end of file
entity/Contract_entity/entityfields/contractdue/onValidation.js 0 → 100644
+ 11
− 0
View file @ 89265954
import("system.result");
import("system.translate");
import("system.vars");
import("Date_lib");
var dateUtils = new DateUtils();
var cDue = vars.get("$local.value");
if (dateUtils.validateBeginnBeforeEnd(vars.get("$field.CONTRACTSTART"), cDue) === false || dateUtils.validateBeginnBeforeEnd(cDue, vars.get("$field.CONTRACTEND")) === false) {
result.string(translate.text("Nächste Fälligkeit muss nach Vertragsbeginn und vor Vertragsende liegen!"));
}
entity/Contract_entity/entityfields/contractend/onValidation.js 0 → 100644
+ 18
− 0
View file @ 89265954
import("system.logging");
import("system.neon");
import("system.result");
import("system.translate");
import("system.vars");
import("Date_lib");
logging.log("###END_onValidation");
var dateUtils = new DateUtils();
var cEnd = vars.get("$local.value");
var cDue = vars.get("$field.CONTRACTDUE");
if (cDue > cEnd && cDue != "")
neon.setFieldValue("$field.CONTRACTDUE", cEnd);
if (dateUtils.validateBeginnBeforeEnd(vars.get("$field.CONTRACTSTART"), cEnd) === false)
result.string(translate.text("Das Ende-Datum muss nach dem Beginn-Datum liegen"));
\ No newline at end of file
entity/Contract_entity/entityfields/contractend/onValueChange.js 0 → 100644
+ 0
− 0
View file @ 89265954
entity/Contract_entity/entityfields/contracthistory_dfo/children/rowid_param/code.js 0 → 100644
+ 4
− 0
View file @ 89265954
import("system.vars");
import("system.result");
result.string(vars.get("$field.CONTRACTID"));
\ No newline at end of file
entity/Contract_entity/entityfields/contractstart/onValidation.js 0 → 100644
+ 18
− 0
View file @ 89265954
import("system.logging");
import("system.neon");
import("system.result");
import("system.translate");
import("system.vars");
import("Date_lib");
logging.log("###START_validation");
var dateUtils = new DateUtils();
var cStart = vars.get("$local.value");
var cDue = vars.get("$field.CONTRACTDUE");
if (cDue < cStart && cDue != "")
neon.setFieldValue("$field.CONTRACTDUE", cStart);
if (dateUtils.validateBeginnBeforeEnd(cStart, vars.get("$field.CONTRACTEND")) === false)
result.string(translate.text("Das Ende-Datum muss nach dem Beginn-Datum liegen"));
\ No newline at end of file
entity/Contract_entity/entityfields/contractstatus/possibleItemsProcess.js 0 → 100644
+ 8
− 0
View file @ 89265954
import("system.result");
import("Keyword_lib");
var kwdUtils, items;
kwdUtils = new KeywordUtils();
items = kwdUtils.getStandardArray("CONTRACT.CONTRACTSTATUS");
result.object(items);
\ No newline at end of file
entity/Contract_entity/entityfields/contracttype/possibleItemsProcess.js 0 → 100644
+ 8
− 0
View file @ 89265954
import("system.result");
import("Keyword_lib");
var kwdUtils, items;
kwdUtils = new KeywordUtils();
items = kwdUtils.getStandardArray("CONTRACT.CONTRACTTYPE");
result.object(items);
\ No newline at end of file
entity/Contract_entity/entityfields/date_edit/valueProcess.js 0 → 100644
+ 6
− 0
View file @ 89265954
import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
result.string(vars.getString("$sys.date"));
\ No newline at end of file
entity/Contract_entity/entityfields/date_new/valueProcess.js 0 → 100644
+ 6
− 0
View file @ 89265954
import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.getString("$sys.date"));
\ No newline at end of file
entity/Contract_entity/entityfields/image/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 89265954
import("system.vars");
import("system.result");
result.string("TEXT:" + vars.getString("$field.CONTRACTCODE"));
\ No newline at end of file
entity/Contract_entity/entityfields/payment/possibleItemsProcess.js 0 → 100644
+ 8
− 0
View file @ 89265954
import("system.result");
import("Keyword_lib");
var kwdUtils, items;
kwdUtils = new KeywordUtils();
items = kwdUtils.getStandardArray("CONTRACT.PAYMENT");
result.object(items);
\ No newline at end of file
entity/Contract_entity/entityfields/relation_id/fieldIdProcess.js 0 → 100644
+ 6
− 0
View file @ 89265954
import("system.vars");
import("system.db");
import("system.result");
import("system.neon");
result.string (vars.get("$this.value"));
\ No newline at end of file
entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js 0 → 100644
+ 14
− 0
View file @ 89265954
import("system.logging");
import("system.vars");
import("system.result");
import("system.neon");
var relid = vars.getString("$this.value");
if(vars.exists("$image.lookup_orgname") && vars.get("$image.lookup_orgname") != '')
result.string("Org_context");
else if((relid == null || relid.trim() == "0")
&& (vars.get("$sys.operatingstate") != neon.OPERATINGSTATE_NEW))
result.string(null);
else
result.string("Org_context");
entity/Contract_entity/entityfields/relation_id/valueMappingProcess.js 0 → 100644
+ 0
− 0
View file @ 89265954
entity/Contract_entity/entityfields/relation_id/valueProcess.js 0 → 100644
+ 9
− 0
View file @ 89265954
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
{
if(vars.exists("$param.RelId_param") && vars.get("$param.RelId_param") != null)
result.string(vars.getString("$param.RelId_param"));
}
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