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

Angebot Field-Prozesse, diverse Bugfixes

parent 0ac07db0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 461 additions and 10 deletions
aliasDefinition/Data_alias/Data_alias.aod
+ 214
− 0
View file @ 6fa059dd
......@@ -2358,6 +2358,220 @@
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
<name>OFFER</name>
<dbName></dbName>
<idColumn>OFFERID</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>CURRENCY</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>LANGUAGE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="5" />
<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>VAT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>OFFERDATE</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>OFFERID</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>SALESPROJECT_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_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>OFFERCODE</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>PROBABILITY</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>STATUS</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="true" />
<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>NET</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2" />
<size v="14" />
<scale v="2" />
<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 @ 6fa059dd
......@@ -18,6 +18,7 @@
<node name="SALES" kind="123" title="Sales">
<node name="Group2" kind="123" title="">
<node name="Salesproject_context" kind="10077" />
<node name="Offer_context" kind="10077" />
<node name="Contract_context" kind="10077" />
<node name="Product_context" kind="10077" />
<node name="INTERNAL_ADMINISTRATOR" kind="159" />
......
entity/Contract_entity/Contract_entity.aod
+ 1
− 0
View file @ 6fa059dd
......@@ -49,6 +49,7 @@
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractstart/onValidation.js</onValidation>
<onValueChange>%aditoprj%/entity/Contract_entity/entityfields/contractstart/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>CONTRACTSTATUS</name>
......
entity/Contract_entity/entityfields/contractend/onValidation.js
+ 0
− 6
View file @ 6fa059dd
import("system.logging");
import("system.neon");
import("system.result");
import("system.vars");
import("Date_lib");
......@@ -8,9 +6,5 @@ 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);
//TODO: auslagern in onValueChange
if (dateUtils.validateBeginnBeforeEnd(vars.get("$field.CONTRACTSTART"), cEnd) === false)
result.string(dateUtils.getValidationFailString());
\ No newline at end of file
entity/Contract_entity/entityfields/contractend/onValueChange.js
+ 7
− 0
View file @ 6fa059dd
import("system.vars");
var cEnd = vars.get("$local.value");
var cDue = vars.get("$field.CONTRACTDUE");
if (cDue > cEnd && cDue != "")
vars.set("$field.CONTRACTDUE", cEnd);
\ No newline at end of file
entity/Contract_entity/entityfields/contractstart/onValidation.js
+ 0
− 4
View file @ 6fa059dd
......@@ -7,9 +7,5 @@ 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);
//TODO: auslagern in onValueChange
if (dateUtils.validateBeginnBeforeEnd(cStart, vars.get("$field.CONTRACTEND")) === false)
result.string(dateUtils.getValidationFailString());
\ No newline at end of file
entity/Contract_entity/entityfields/contractstart/onValueChange.js 0 → 100644
+ 7
− 0
View file @ 6fa059dd
import("system.vars");
var cStart = vars.get("$local.value");
var cDue = vars.get("$field.CONTRACTDUE");
if (cDue < cStart && cDue != "")
vars.set("$field.CONTRACTDUE", cStart);
\ No newline at end of file
entity/Offer_entity/Offer_entity.aod 0 → 100644
+ 133
− 0
View file @ 6fa059dd
<?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>Offer_entity</name>
<title>Offer</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<alias>Data_alias</alias>
<recordContainerType>DB</recordContainerType>
<caption>Offer</caption>
<entityFields>
<entityIncomingField>
<name>#INCOMING</name>
</entityIncomingField>
<entityField>
<name>CURRENCY</name>
<tableName>OFFER</tableName>
<columnName>CURRENCY</columnName>
<caption>Currency</caption>
<possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
<tableName>OFFER</tableName>
<columnName>DATE_EDIT</columnName>
<contentType>DATE</contentType>
<outputFormat>yyyy-MM-dd&amp;apos;T&amp;apos;HH:mm:ssZ</outputFormat>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
<tableName>OFFER</tableName>
<columnName>DATE_NEW</columnName>
<contentType>DATE</contentType>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>LANGUAGE</name>
<tableName>OFFER</tableName>
<columnName>LANGUAGE</columnName>
<caption>Language</caption>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/language/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>NET</name>
<tableName>OFFER</tableName>
<columnName>NET</columnName>
<caption>Total net</caption>
</entityField>
<entityField>
<name>OFFERCODE</name>
<tableName>OFFER</tableName>
<columnName>OFFERCODE</columnName>
<caption>Offer number</caption>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offercode/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Offer_entity/entityfields/offercode/onValidation.js</onValidation>
</entityField>
<entityField>
<name>OFFERDATE</name>
<tableName>OFFER</tableName>
<columnName>OFFERDATE</columnName>
<caption>Date</caption>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offerdate/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>OFFERID</name>
<tableName>OFFER</tableName>
<columnName>OFFERID</columnName>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offerid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PROBABILITY</name>
<tableName>OFFER</tableName>
<columnName>PROBABILITY</columnName>
<caption>Probability</caption>
<possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>RELATION_ID</name>
<tableName>OFFER</tableName>
<columnName>RELATION_ID</columnName>
<caption>Contact / Company</caption>
<mandatory v="true" />
</entityField>
<entityField>
<name>SALESPROJECT_ID</name>
<tableName>OFFER</tableName>
<columnName>SALESPROJECT_ID</columnName>
<caption>Salesproject</caption>
</entityField>
<entityField>
<name>STATUS</name>
<tableName>OFFER</tableName>
<columnName>STATUS</columnName>
<caption>Status</caption>
<possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
<tableName>OFFER</tableName>
<columnName>USER_EDIT</columnName>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_NEW</name>
<tableName>OFFER</tableName>
<columnName>USER_NEW</columnName>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>VAT</name>
<tableName>OFFER</tableName>
<columnName>VAT</columnName>
<caption>Total VAT</caption>
</entityField>
<entityField>
<name>IMAGE</name>
<contentType>IMAGE</contentType>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/image/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<linkInformation>
<linkInformation>
<name>8f05a818-b447-40e6-8ee6-d3c2452f3dbe</name>
<tableName>OFFER</tableName>
<primaryKey>OFFERID</primaryKey>
<isUIDTable v="true" />
</linkInformation>
</linkInformation>
</entity>
entity/Offer_entity/entityfields/currency/possibleItemsProcess.js 0 → 100644
+ 8
− 0
View file @ 6fa059dd
import("system.result");
import("Keyword_lib");
var kwdUtils, items;
kwdUtils = new KeywordUtils();
items = kwdUtils.getStandardArray("CURRENCY");
result.object(items);
\ No newline at end of file
entity/Offer_entity/entityfields/date_edit/valueProcess.js 0 → 100644
+ 6
− 0
View file @ 6fa059dd
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/Offer_entity/entityfields/date_new/valueProcess.js 0 → 100644
+ 6
− 0
View file @ 6fa059dd
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/Offer_entity/entityfields/image/valueProcess.js 0 → 100644
+ 7
− 0
View file @ 6fa059dd
import("system.vars");
import("system.result");
import("Keyword_lib");
var KeywUtils = new KeywordUtils();
result.string("TEXT:" + KeywUtils.getViewValue("OFFER.STATUS", vars.getString("$field.STATUS")) );
\ No newline at end of file
entity/Offer_entity/entityfields/language/possibleItemsProcess.js 0 → 100644
+ 8
− 0
View file @ 6fa059dd
import("system.result");
import("Keyword_lib");
var kwdUtils, items;
kwdUtils = new KeywordUtils();
items = kwdUtils.getStandardArray("LANGUAGE");
result.object(items);
\ No newline at end of file
entity/Offer_entity/entityfields/offercode/onValidation.js 0 → 100644
+ 11
− 0
View file @ 6fa059dd
import("system.vars");
import("system.result");
import("system.neon");
import("Offer_lib");
var OfferUtils = new OfferUtils();
if( !OfferUtils.validateOfferNumber(vars.get("$local.value")) )
{
result.string(OfferUtils.getOfferNumberValidationFailString());
}
\ No newline at end of file
entity/Offer_entity/entityfields/offercode/valueProcess.js 0 → 100644
+ 11
− 0
View file @ 6fa059dd
import("system.vars");
import("system.result");
import("system.neon");
import("Offer_lib");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
{
var OfferUtils = new OfferUtils();
result.string( OfferUtils.getNextOfferNumber() );
}
\ No newline at end of file
entity/Offer_entity/entityfields/offerdate/valueProcess.js 0 → 100644
+ 12
− 0
View file @ 6fa059dd
import("system.vars");
import("system.result");
import("system.neon");
import("Date_lib");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == "")
{
var DateUtils = new DateUtils();
result.string(DateUtils.getTodayUTC());
}
else
result.string(vars.get("$this.value"));
\ No newline at end of file
entity/Offer_entity/entityfields/offerid/valueProcess.js 0 → 100644
+ 7
− 0
View file @ 6fa059dd
import("system.util");
import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
result.string(util.getNewUUID());
\ No newline at end of file
entity/Offer_entity/entityfields/probability/possibleItemsProcess.js 0 → 100644
+ 8
− 0
View file @ 6fa059dd
import("system.result");
import("Keyword_lib");
var kwdUtils, items;
kwdUtils = new KeywordUtils();
items = kwdUtils.getStandardArray("OFFER.PROBABILITY");
result.object(items);
\ No newline at end of file
entity/Offer_entity/entityfields/status/possibleItemsProcess.js 0 → 100644
+ 8
− 0
View file @ 6fa059dd
import("system.result");
import("Keyword_lib");
var kwdUtils, items;
kwdUtils = new KeywordUtils();
items = kwdUtils.getStandardArray("OFFER.STATUS");
result.object(items);
\ No newline at end of file
entity/Offer_entity/entityfields/user_edit/valueProcess.js 0 → 100644
+ 6
− 0
View file @ 6fa059dd
import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
result.string(vars.getString("$sys.user"));
\ No newline at end of file
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