Skip to content
Snippets Groups Projects
Commit 7b8b1ead authored by Andreas Schindlbeck's avatar Andreas Schindlbeck
Browse files

merged origin/master into favoriten

parents 998e3376 441a7c5b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 87 additions and 25 deletions
.liquibase/Data_alias/basic/2020.1.1/changelog.xml
+ 0
− 1
View file @ 7b8b1ead
......@@ -2,5 +2,4 @@
<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="AlterTablesToDatetime.xml"/>
<include relativeToChangelogFile="true" file="Notification/changelog.xml"/>
</databaseChangeLog>
.liquibase/Data_alias/basic/2020.1.2/changelog.xml
+ 3
− 2
View file @ 7b8b1ead
......@@ -2,7 +2,8 @@
<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 file="AlterDatatypeOfKeyColumnsToChar/changelog.xml" relativeToChangelogFile="true"/>
<include file="VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml" relativeToChangelogFile="true"/>
<include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />
<include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />
<include file="insert_workflowCategory_keyword.xml" relativeToChangelogFile="true"/>
<include file="Notification/changelog.xml" relativeToChangelogFile="true" />
<include file="AlterButtonLabelTitles/AlterButtonLabelTitles.xml" relativeToChangelogFile="true" />
</databaseChangeLog>
.liquibase/Data_alias/basic/2020.1.2/insert_workflowCategory_keyword.xml 0 → 100644
+ 24
− 0
View file @ 7b8b1ead
<?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.listl" id="38b13161-5163-48d9-9791-f9c7027cac62">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="f241b36a-c2fe-40be-9e2e-8293c700d096"/>
<column name="KEYID" value="WORKFLOWCATEGORYMARKETING"/>
<column name="TITLE" value="Marketing"/>
<column name="CONTAINER" value="WorkflowCategory"/>
<column name="SORTING" valueNumeric="1"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="00a72718-554e-46ab-b83c-fb9b81be4be6"/>
<column name="KEYID" value="WORKFLOWCATEGORYRELEASE"/>
<column name="TITLE" value="Release"/>
<column name="CONTAINER" value="WorkflowCategory"/>
<column name="SORTING" valueNumeric="2"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
</changeSet>
</databaseChangeLog>
.liquibase/Data_alias/changelog.xml
+ 1
− 1
View file @ 7b8b1ead
......@@ -14,7 +14,7 @@
<include relativeToChangelogFile="true" file="basic/2020.1.0/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2020.1.1/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2020.1.2/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"/>-->
</databaseChangeLog>
\ No newline at end of file
entity/Address_entity/Address_entity.aod
+ 0
− 2
View file @ 7b8b1ead
......@@ -15,8 +15,6 @@
<mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/address/mandatoryProcess.js</mandatoryProcess>
<textInputAllowed v="true" />
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/address/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/address/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/address/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/Address_entity/entityfields/address/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
......
entity/Address_entity/entityfields/address/displayValueProcess.js deleted 100644 → 0
+ 0
− 6
View file @ 998e3376
import("system.vars");
import("system.result");
// Needed for instant refresh if set by neon.setFieldValue
// use the code if address webservice is active
//result.string(vars.get("$field.ADDRESS"));
\ No newline at end of file
entity/Address_entity/entityfields/address/valueProcess.js deleted 100644 → 0
+ 0
− 6
View file @ 998e3376
import("system.result");
import("WsValidation_lib");
import("system.vars");
// use the code if address webservice is active
//result.string(WsValidationUtils.valueFromJSON(vars.get("$this.value")));
\ No newline at end of file
entity/Address_entity/entityfields/address_ws/valueProcess.js
+ 3
− 1
View file @ 7b8b1ead
import("system.vars");
import("WsValidation_lib");
WsValidationFieldUtils.wsValueProcess(WsValidationType.get().TYPE_STREET_NOMINATIM, "$field.ADDRESS");
\ No newline at end of file
if(!vars.get("$this.value"))
WsValidationFieldUtils.wsValueProcess(WsValidationType.get().TYPE_STREET_NOMINATIM, "$field.ADDRESS");
\ No newline at end of file
entity/Email_entity/Email_entity.aod
+ 1
− 1
View file @ 7b8b1ead
......@@ -119,7 +119,7 @@
</entityParameter>
<entityActionField>
<name>sendMail</name>
<title>send mail</title>
<title>{SEND_MAIL}</title>
<onActionProcess>%aditoprj%/entity/Email_entity/entityfields/sendmail/onActionProcess.js</onActionProcess>
<iconId>VAADIN:AT</iconId>
<stateProcess>%aditoprj%/entity/Email_entity/entityfields/sendmail/stateProcess.js</stateProcess>
......
entity/Employee_entity/entityfields/contact_id/onValueChange.js
+ 1
− 1
View file @ 7b8b1ead
......@@ -22,7 +22,7 @@ if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.r
neon.setFieldValues({
"$field.FIRSTNAME" : name[0] || "",
"$field.LASTNAME" : name[1] || "",
"$field.EMAIL_ADDRESS" : name[2] || "",
"$field.EMAIL_ADDRESS" : name[2] || vars.get("$field.EMAIL_ADDRESS") || "",
"$field.TITLE" : username
});
}
\ No newline at end of file
entity/Employee_entity/entityfields/email_address/dropDownProcess.js
+ 1
− 1
View file @ 7b8b1ead
......@@ -6,7 +6,7 @@ import("system.result");
import("Sql_lib");
var contactId = vars.get("$field.CONTACT_ID");
if (contactId && (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW))
if (contactId)
{
var addresses = newSelect("ADDR, ADDR")
.from("COMMUNICATION")
......
entity/Notification_entity/Notification_entity.aod
+ 3
− 3
View file @ 7b8b1ead
......@@ -34,7 +34,7 @@
</entityField>
<entityField>
<name>CAPTION</name>
<title>title</title>
<title>Title</title>
</entityField>
<entityField>
<name>CREATEDATE</name>
......@@ -45,7 +45,7 @@
</entityField>
<entityField>
<name>DESCRIPTION</name>
<title>description</title>
<title>Description</title>
</entityField>
<entityField>
<name>FORCEDPRIORITY</name>
......@@ -124,7 +124,7 @@
</entityActionGroup>
<entityField>
<name>RESOLVEDPRIORITY</name>
<title>priority</title>
<title>Priority</title>
<consumer>PrioKeywords</consumer>
<textInputAllowed v="false" />
</entityField>
......
entity/Offer_entity/Offer_entity.aod
+ 14
− 0
View file @ 7b8b1ead
......@@ -1023,6 +1023,7 @@
<entityAggregateField>
<name>NET_aggregate</name>
<parentField>NET</parentField>
<title>Sum</title>
</entityAggregateField>
<entityField>
<name>OFFER_OBJECTTYPE</name>
......@@ -1038,6 +1039,15 @@
<parentField>COUNT</parentField>
<title>Count</title>
</entityAggregateField>
<entityAggregateField>
<name>PROBABILITY_aggregate</name>
<parentField>PROBABILITY</parentField>
<title>Ø Probability</title>
</entityAggregateField>
<entityProvider>
<name>OfferAggregates</name>
<useAggregates v="true" />
</entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -1285,6 +1295,10 @@
<recordfield>OFFER.OFFER_ID</recordfield>
<aggregateType>COUNT</aggregateType>
</aggregateFieldDbMapping>
<aggregateFieldDbMapping>
<name>PROBABILITY_aggregate.value</name>
<expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability_aggregate.value/expression.js</expression>
</aggregateFieldDbMapping>
</recordFieldMappings>
<filterExtensions>
<filterExtensionSet>
......
entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability_aggregate.value/expression.js 0 → 100644
+ 6
− 0
View file @ 7b8b1ead
import("system.SQLTYPES");
import("system.result");
import("Sql_lib");
var helper = new SqlMaskingUtils();
result.string("AVG("+ helper.cast("OFFER.PROBABILITY", SQLTYPES.INTEGER) + ")");
\ No newline at end of file
entity/Salesproject_entity/Salesproject_entity.aod
+ 7
− 0
View file @ 7b8b1ead
......@@ -750,6 +750,13 @@
<iconId>VAADIN:PLAY</iconId>
<stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/startworkflow/stateProcess.js</stateProcess>
</entityActionField>
<entityField>
<name>PROBABILITY_AI</name>
<title>Probability AI</title>
<state>READONLY</state>
<stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/probability_ai/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/probability_ai/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>SALESPROJECT_OBJECTTYPE</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesproject_objecttype/valueProcess.js</valueProcess>
......
entity/Salesproject_entity/entityfields/probability_ai/stateProcess.js 0 → 100644
+ 7
− 0
View file @ 7b8b1ead
import("system.result");
import("system.project");
if(!JSON.parse(project.getPreferenceValue("custom.ai.salesprojectProbability", "false")))
{
result.string("INVISIBLE");
}
\ No newline at end of file
entity/Salesproject_entity/entityfields/probability_ai/valueProcess.js 0 → 100644
+ 16
− 0
View file @ 7b8b1ead
import("system.vars");
import("system.logging");
import("system.result");
import("AISalesproject_lib");
import("system.project");
if(JSON.parse(project.getPreferenceValue("custom.ai.salesprojectProbability", "false")))
{
result.string(AISalesprojectUtil.classify(vars.getString("$field.SALESPROJECTID"),
vars.getString("$field.CONTACT_ID"),
vars.getString("$field.PHASE"),
vars.getString("$field.STATUS"),
vars.getString("$field.VOLUME"),
vars.getString("$field.PROBABILITY")));
}
\ 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