Skip to content
Snippets Groups Projects
Commit 1dc4cf0e authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

Merge master into Feature_1034869 

Conflicts:
	others/db_changes/masterChangelog.xml
parents 74fdccc1 e5f863eb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 98 additions and 82 deletions
entity/Task_entity/Task_entity.aod
+ 4
− 4
View file @ 1dc4cf0e
......@@ -19,9 +19,7 @@
<title>task number</title>
<contentType>NUMBER</contentType>
<outputFormat>0000000</outputFormat>
<state>READONLY</state>
<stateProcess>%aditoprj%/entity/Task_entity/entityfields/code/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/code/valueProcess.js</valueProcess>
<state>DISABLED</state>
</entityField>
<entityField>
<name>SUBJECT</name>
......@@ -78,7 +76,9 @@
<name>TYPE</name>
<title>type</title>
<consumer>KeywordTypes</consumer>
<groupable v="true" />
<searchable v="false" />
<groupable v="false" />
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/type/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DESCRIPTION</name>
......
entity/Task_entity/entityfields/code/documentation.adoc
+ 1
− 3
View file @ 1dc4cf0e
The `CODE` field is a automatically increased sequential number.
It cannot be set by the user.
Therefore it's only visible after creation of a `TASK` record.
\ No newline at end of file
The `CODE` field is reserved for future implementations. It's in no view and does not store any value or has any other interaction.
\ No newline at end of file
entity/Task_entity/entityfields/code/stateProcess.js deleted 100644 → 0
+ 0
− 11
View file @ 74fdccc1
import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
//the code (tasknumber) value is genereated before save to prevent duplicate numbers
//so: no need to display it on new
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(neon.COMPONENTSTATE_INVISIBLE);
else
result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
entity/Task_entity/entityfields/code/valueProcess.js deleted 100644 → 0
+ 0
− 18
View file @ 74fdccc1
import("system.logging");
import("system.neon");
import("system.db");
import("system.vars");
import("Sql_lib");
//if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
//{
// var maskingHelper = new SqlMaskingUtils();
// var newCodeNumber = db.cell("select " + maskingHelper.max("TASK.CODE") + " from TASK");
// newCodeNumber = Number(newCodeNumber);//if no number exists till no, start value will be 1 (due to: ++0)
// if (isNaN(newCodeNumber))
// throw new TypeError();//TODO:add Message
// ++newCodeNumber;
// logging.log("newCodeNumber: " + newCodeNumber)
// vars.set("$field.CODE", newCodeNumber);
//}
\ No newline at end of file
entity/Task_entity/entityfields/type/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 1dc4cf0e
import("system.result");
// Sets the type to "Task" as default value.
result.string("4dee8727-8299-422e-ae41-6cdf9de2dfd7");
\ No newline at end of file
entity/Task_entity/onValidation.js
+ 0
− 17
View file @ 1dc4cf0e
import("system.translate");
import("system.db");
import("system.vars");
import("system.text");
import("system.neon");
import("Sql_lib");
//TODO: this should no happen in onValidation; waiting for #1032668
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
var maskingHelper = new SqlMaskingUtils();
var newCodeNumber = db.cell("select " + maskingHelper.max("TASK.CODE") + " from TASK");
newCodeNumber = Number(newCodeNumber);//if no number exists till no, start value will be 1 (due to: ++0)
if (isNaN(newCodeNumber))
throw new TypeError(translate.text("The code number is not a valid number."));
neon.setFieldValue("$field.CODE", ++newCodeNumber);
}
\ No newline at end of file
entity/Task_entity/recordcontainers/db/orderClauseProcess.js
+ 1
− 1
View file @ 1dc4cf0e
import("system.db");
import("system.result");
result.object({"TASK.CODE": db.DESCENDING});
\ No newline at end of file
result.object({"TASK.MATURITY_DATE": db.DESCENDING});
\ No newline at end of file
neonView/OrgEditDefaults_view/OrgEditDefaults_view.aod 0 → 100644
+ 31
− 0
View file @ 1dc4cf0e
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
<name>OrganisationEditDefaults_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<genericViewTemplate>
<name>EditDefaults_template</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>08c00d5b-fc5e-451b-8341-0e5c5172faa8</name>
<entityField>ADDRESS_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>8fac75ad-cde5-411c-b0ad-744b5aab0c5d</name>
<entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
</entityFieldLink>
<entityFieldLink>
<name>48722352-b85f-47d4-a6b1-dc87f9e9e6fc</name>
<entityField>STANDARD_PHONE_COMMUNICATION</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
</neonView>
neonView/TaskEdit_view/TaskEdit_view.aod
+ 0
− 8
View file @ 1dc4cf0e
......@@ -13,10 +13,6 @@
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>bc1d5872-58e5-4799-a382-79e74945cc75</name>
<entityField>CODE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>fb5768fe-2dd2-45cd-8d21-f20af279f409</name>
<entityField>SUBJECT</entityField>
......@@ -37,10 +33,6 @@
<name>0f600024-eb83-445c-8eb9-62bcf9e95313</name>
<entityField>PRIORITY</entityField>
</entityFieldLink>
<entityFieldLink>
<name>8173056f-fac6-4ee0-a8ff-c27c8184e6e9</name>
<entityField>TYPE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>71d2b122-1687-454a-ae60-7e68aa83106c</name>
<entityField>PROTECTIONLEVEL</entityField>
......
neonView/TaskFilter_view/TaskFilter_view.aod
+ 0
− 4
View file @ 1dc4cf0e
......@@ -39,10 +39,6 @@
<entityField>#ENTITY</entityField>
<title></title>
<columns>
<neonTableColumn>
<name>c60f59e5-f56b-4d13-87fc-e8c8e65bebd7</name>
<entityField>CODE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>591cd079-a8e9-49aa-8a2d-afb643aef079</name>
<entityField>SUBJECT</entityField>
......
neonView/TaskMainPreview_view/TaskMainPreview_view.aod
+ 0
− 4
View file @ 1dc4cf0e
......@@ -19,10 +19,6 @@
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>0bfb984a-1a1b-404d-beb9-a1b8002ebed2</name>
<entityField>CODE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>f988850e-53ed-443d-bd3d-16946eba656e</name>
<entityField>START_DATE</entityField>
......
neonView/TaskMain_view/TaskMain_view.aod
+ 0
− 4
View file @ 1dc4cf0e
......@@ -24,10 +24,6 @@
<name>e95918f5-d21e-4c99-8d05-d70811aa3d89</name>
<entityField>PROTECTIONLEVEL</entityField>
</entityFieldLink>
<entityFieldLink>
<name>e73dda40-22cd-4d2d-abcf-c7fc59ea2e67</name>
<entityField>TYPE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>fea59f13-750b-427d-bf33-cc1bead95446</name>
<entityField>DESCRIPTION</entityField>
......
neonView/TaskPreview_view/TaskPreview_view.aod
+ 0
− 8
View file @ 1dc4cf0e
......@@ -20,10 +20,6 @@
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>0bfb984a-1a1b-404d-beb9-a1b8002ebed2</name>
<entityField>CODE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>f988850e-53ed-443d-bd3d-16946eba656e</name>
<entityField>START_DATE</entityField>
......@@ -40,10 +36,6 @@
<name>d9e4daef-84df-415c-9be7-3238c2760c07</name>
<entityField>PROTECTIONLEVEL</entityField>
</entityFieldLink>
<entityFieldLink>
<name>5bcbaa89-0826-4ef8-872d-bd68dbd8ef77</name>
<entityField>TYPE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>05de9afc-429e-46a8-8e3b-2ff689ed090e</name>
<entityField>REQUESTOR_CONTACT_ID</entityField>
......
others/db_changes/data_alias/basic/2019.2/ChangeNotes.txt 0 → 100644
+ 3
− 0
View file @ 1dc4cf0e
* all TaskTypes are deleted, new Type "Task" is created
- you may have to update all Tasks to use type "Tak" (keyid: 4dee8727-8299-422e-ae41-6cdf9de2dfd799)
* Column CODE is reset to NULL on all tasks (it is curently not needed by basic)
\ No newline at end of file
others/db_changes/data_alias/basic/2019.2/activity_add_parent.xml 0 → 100644
+ 9
− 0
View file @ 1dc4cf0e
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="a.loreth" id="31d7b6f2-c376-4bfa-ba42-9aab6f07737c">
<addColumn tableName="ACTIVITY">
<column name="PARENT_CONTEXT" type="VARCHAR(64)"/>
<column name="PARENT_ID" type="CHAR(36)"/>
</addColumn>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
others/db_changes/data_alias/basic/2019.2/changelog.xml 0 → 100644
+ 45
− 0
View file @ 1dc4cf0e
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_privat.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_gfk.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_mnf.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_lichtenstein.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_kaeltetechnik.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_pichelmaier.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_person/PERSON_pfiffig.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_person/PERSON_sommer.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_person/PERSON_muller.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_person/PERSON_leicht.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_person/PERSON_kanzler.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_person/PERSON_gruener.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_person/PERSON_obermeier.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_person/PERSON_smith.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_person/PERSON_lustig.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1000.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1001.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1002.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1003.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1004.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_product/PRODUCT_42154311.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesproject/SALESPROJECT_gfk.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesproject/SALESPROJECT_jkl.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_activity/ACTIVITY_gfk.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_offer/OFFER_1000.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_offer/OFFER_1001.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_offer/OFFER_1002.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_offer/OFFER_1003.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_offer/OFFER_1004.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1000.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1001.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1002.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1004.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1003.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_task/base.xml" context="example"/>
<include relativeToChangelogFile="true" file="update_TaskType_Task.xml"/>
<include relativeToChangelogFile="true" file="removeTaskCode.xml"/>
<include relativeToChangelogFile="true" file="activity_add_parent.xml"/>
<include relativeToChangelogFile="true" file="task_add_parent.xml"/>
</databaseChangeLog>
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