Skip to content
Snippets Groups Projects
Commit 0bd36e2a authored by Maximilian Hofmann's avatar Maximilian Hofmann
Browse files

Merge master into #1034075-renaming

parents 6d0483fd 523d8107
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 261 additions and 86 deletions
entity/KeywordEntry_entity/entityfields/keywordattributerelations/children/containername_param/code.js deleted 100644 → 0
+ 0
− 4
View file @ 6d0483fd
import("system.vars");
import("system.result");
result.string(vars.get("$field.CONTAINER"));
\ No newline at end of file
entity/KeywordEntry_entity/recordcontainers/db/onDBUpdate.js
+ 0
− 1
View file @ 0bd36e2a
import("system.logging");
import("system.db");
import("system.vars");
import("system.text");
......
entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+ 6
− 0
View file @ 0bd36e2a
......@@ -30,6 +30,8 @@
<entityProvider>
<name>SalesprojectMembers</name>
<fieldType>DEPENDENCY_IN</fieldType>
<targetContextField>TARGETCONTEXT</targetContextField>
<targetIdField>CONTACT_ID</targetIdField>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
......@@ -145,6 +147,10 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>TARGETCONTEXT</name>
<valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js 0 → 100644
+ 2
− 0
View file @ 0bd36e2a
import("system.result");
result.string("Person_context"); //to show the preview of the person
\ No newline at end of file
neonView/KeywordAttributeRelationRows_view/KeywordAttributeRelationRows_view.aod
+ 2
− 2
View file @ 0bd36e2a
......@@ -19,8 +19,8 @@
<entityField>AB_KEYWORD_ATTRIBUTE_ID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>04d24334-3b82-4193-b289-6a96f640e521</name>
<entityField>CHAR_VALUE</entityField>
<name>4d5656d1-a928-47d9-9d88-de8572866a79</name>
<entityField>valueProxy</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
......
others/db_changes/data_alias/data/AditoBasic/ab_keyword_attribute.xml 0 → 100644
+ 4
− 0
View file @ 0bd36e2a
<?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="ab_keyword_attribute/init_SalesprojectProbability_points.xml"/>
</databaseChangeLog>
others/db_changes/data_alias/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_points.xml 0 → 100644
+ 11
− 0
View file @ 0bd36e2a
<?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="j.goderbauer" id="a2375d469a-1eda-4b40-802b-312323d9f2e7">
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="2fabbd9a-89d2-49e3-b3aa-1dcbc77252c7"/>
<column name="NAME" value="points"/>
<column name="TYPE" value="NUMBER_VALUE"/>
<column name="CONTAINER" value="SalesprojectProbability"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml
+ 3
− 1
View file @ 0bd36e2a
<?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="ab_keyword_entry/init_KeywordAttributeType.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_ContactStatus.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_ActivityDirection.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_ContractPayment.xml"/>
......@@ -22,5 +23,6 @@
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_StockWarehouse.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_TaskStatus.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_TaskType.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_KeywordAttributeType.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_AttributeType.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectProbability.xml"/>
</databaseChangeLog>
others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml 0 → 100644
+ 97
− 0
View file @ 0bd36e2a
<?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="s.listl" id="55a6a9df-5852-4bd4-ad72-8c575c0a27f6">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="972e5eb1-a457-4b75-b966-1183896dac2c"/>
<column name="KEYID" value="TEXT"/>
<column name="TITLE" value="Text"/>
<column name="CONTAINER" value="AttributeType"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="cb7ecaea-b4e6-460e-9006-4a3d059b9857"/>
<column name="KEYID" value="DATE"/>
<column name="TITLE" value="Date"/>
<column name="CONTAINER" value="AttributeType"/>
<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="14de196a-aaa6-41b9-b503-3df1d45acc1e"/>
<column name="KEYID" value="NUMBER"/>
<column name="TITLE" value="${NUMBER}"/>
<column name="CONTAINER" value="AttributeType"/>
<column name="SORTING" valueNumeric="2"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="8a9791c1-655f-4340-91b4-cfdf6372fc75"/>
<column name="KEYID" value="BOOLEAN"/>
<column name="TITLE" value="Checkbox"/>
<column name="CONTAINER" value="AttributeType"/>
<column name="SORTING" valueNumeric="3"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="1390813c-6b94-4336-9986-9bcaddab69ac"/>
<column name="KEYID" value="COMBO"/>
<column name="TITLE" value="Combobox"/>
<column name="CONTAINER" value="AttributeType"/>
<column name="SORTING" valueNumeric="4"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="2c188a17-2961-45df-bd68-34b55352375c"/>
<column name="KEYID" value="GROUP"/>
<column name="TITLE" value="Group"/>
<column name="CONTAINER" value="AttributeType"/>
<column name="SORTING" valueNumeric="5"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<rollback>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="972e5eb1-a457-4b75-b966-1183896dac2c"/>
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="cb7ecaea-b4e6-460e-9006-4a3d059b9857"/>
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="14de196a-aaa6-41b9-b503-3df1d45acc1e"/>
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="8a9791c1-655f-4340-91b4-cfdf6372fc75"/>
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="1390813c-6b94-4336-9986-9bcaddab69ac"/>
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="2c188a17-2961-45df-bd68-34b55352375c"/>
</whereParams>
</delete>
</rollback>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml 0 → 100644
+ 82
− 0
View file @ 0bd36e2a
<?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="j.goderbauer" id="25ab05e0-51a9-4f6b-ae62-83d0583aef3b">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="ab44bd2c-dffa-4731-8a24-fad31f069c46"/>
<column name="KEYID" value="c5bfa55e-4e9b-4d57-88e1-e06dedb71764"/>
<column name="TITLE" value="0 %"/>
<column name="CONTAINER" value="SalesprojectProbability"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="e59169d3-c0d9-4718-b8b6-e315857948a0"/>
<column name="KEYID" value="b981a107-7e20-42a6-baf4-3fc09a939cd7"/>
<column name="TITLE" value="25 %"/>
<column name="CONTAINER" value="SalesprojectProbability"/>
<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="415f1cf0-8c5b-4b6e-9900-0d0d6d72381c"/>
<column name="KEYID" value="8ff82a56-af38-4f19-9dd7-21d8276bc8e4"/>
<column name="TITLE" value="50 %"/>
<column name="CONTAINER" value="SalesprojectProbability"/>
<column name="SORTING" valueNumeric="2"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="6182cc48-df2b-4ba9-893a-bcedfd0e1e4b"/>
<column name="KEYID" value="67576cf1-29b3-4832-b8fe-9c7913e34ff4"/>
<column name="TITLE" value="75 %"/>
<column name="CONTAINER" value="SalesprojectProbability"/>
<column name="SORTING" valueNumeric="3"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="f5b601a5-451b-4ab6-9167-b95077e90c62"/>
<column name="KEYID" value="ea30b4c3-1767-458a-98a4-2553c25fc5f9"/>
<column name="TITLE" value="100 %"/>
<column name="CONTAINER" value="SalesprojectProbability"/>
<column name="SORTING" valueNumeric="4"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<rollback>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="ab44bd2c-dffa-4731-8a24-fad31f069c46"/>
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="e59169d3-c0d9-4718-b8b6-e315857948a0"/>
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="415f1cf0-8c5b-4b6e-9900-0d0d6d72381c"/>
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="6182cc48-df2b-4ba9-893a-bcedfd0e1e4b"/>
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="f5b601a5-451b-4ab6-9167-b95077e90c62"/>
</whereParams>
</delete>
</rollback>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
others/db_changes/masterChangelog.xml
+ 2
− 1
View file @ 0bd36e2a
......@@ -73,8 +73,9 @@
<include file="data_alias/data/example_salesorder/SALESORDER_1004.xml"/>
<include file="data_alias/data/example_task/base.xml"/>
<!--reference file for keywords:-->
<!--reference files for keywords:-->
<include file="data_alias/data/AditoBasic/ab_keyword_entry.xml"/>
<include file="data_alias/data/AditoBasic/ab_keyword_attribute.xml"/>
<!--special case countryinfo data-->
<include file="data_alias/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml"/>
......
preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+ 1
− 1
View file @ 0bd36e2a
......@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.3">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<projectName>xRM-Basic2019</projectName>
<projectName>basic 2019</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
......
process/Attribute_lib/process.js
+ 49
− 76
View file @ 0bd36e2a
......@@ -89,7 +89,7 @@ AttributeHandler.prototype._getAttributeType = function () //TODO: maybe the typ
attrTypeSelect = SqlCondition.begin()
.andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", this.attributeId)
.buildSql(attrTypeSelect);
this._attributeType = db.cell(attrTypeSelect);
this._attributeType = db.cell(attrTypeSelect).trim();
}
return this._attributeType;
}
......@@ -127,63 +127,54 @@ AttributeHandler.prototype.setAttributeValue = function (pValue)
* This Object is only for the general definition of attribute types and for getting
* data about every type, anything that has to do with a specific attribute (= the function requires an attribute id)
* should be done in AttributeUtils.
*/
var AttributeTypes = {
_attributeTypeConfig : {},
TEXT : "TEXT",
DATE : "DATE",
NUMBER : "NUMBER",
BOOLEAN : "BOOLEAN",
COMBO : "COMBO",
GROUP : "GROUP"
};
/**
* These objects hold important data for the attribute types.
* The values for each type are:
*
* name = the displayed name when selecting the type of an attribute
* contentType = the value that is returned in the contentType process for the attribute
* databaseField = the database field that holds values of attributes with the type
* entityField = the field in the AttributeRelation enity that holds the value of the attribute for that type
*
* The display name is controlled by the keyword 'AttributeType'
*/
AttributeTypes._attributeTypeConfig[AttributeTypes.TEXT] = { //TODO: it would probably be better if the name was a keyword
name : "Text",
contentType : "TEXT",
databaseField : "CHAR_VALUE",
entityField : "CHAR_VALUE"
};
AttributeTypes._attributeTypeConfig[AttributeTypes.DATE] = {
name : "Date",
contentType : "DATE",
databaseField : "DATE_VALUE",
entityField : "DATE_VALUE"
};
AttributeTypes._attributeTypeConfig[AttributeTypes.NUMBER] = {
name : "${NUMBER}",
contentType : "NUMBER",
databaseField : "NUMBER_VALUE",
entityField : "NUMBER_VALUE"
};
AttributeTypes._attributeTypeConfig[AttributeTypes.BOOLEAN] = {
name : "Checkbox",
contentType : "BOOLEAN",
databaseField : "BOOL_VALUE",
entityField : "BOOL_VALUE"
};
AttributeTypes._attributeTypeConfig[AttributeTypes.COMBO] = {
name : "Combobox",
contentType : "TEXT",
databaseField : "ID_VALUE",
entityField : "ID_VALUE"
};
AttributeTypes._attributeTypeConfig[AttributeTypes.GROUP] = {
name : "Group",
contentType : null,
databaseField : null,
entityField : null
var AttributeTypes = {
TEXT : {
toString : function () {return "TEXT"},
contentType : "TEXT",
databaseField : "CHAR_VALUE",
entityField : "CHAR_VALUE"
},
DATE : {
toString : function () {return "DATE"},
contentType : "DATE",
databaseField : "DATE_VALUE",
entityField : "DATE_VALUE"
},
NUMBER : {
toString : function () {return "NUMBER"},
contentType : "NUMBER",
databaseField : "NUMBER_VALUE",
entityField : "NUMBER_VALUE"
},
BOOLEAN : {
toString : function () {return "BOOLEAN"},
contentType : "BOOLEAN",
databaseField : "BOOL_VALUE",
entityField : "BOOL_VALUE"
},
COMBO : {
toString : function () {return "COMBO"},
contentType : "TEXT",
databaseField : "ID_VALUE",
entityField : "ID_VALUE"
},
GROUP : {
toString : function () {return "GROUP"},
contentType : null,
databaseField : null,
entityField : null
}
};
/**
* returns the required contentType for the given attribute type
*
......@@ -193,8 +184,8 @@ AttributeTypes._attributeTypeConfig[AttributeTypes.GROUP] = {
*/
AttributeTypes.getContentType = function (pAttributeType)
{
if (pAttributeType in AttributeTypes._attributeTypeConfig)
return AttributeTypes._attributeTypeConfig[pAttributeType].contentType;
if (pAttributeType in AttributeTypes)
return AttributeTypes[pAttributeType].contentType;
return null;
}
......@@ -207,8 +198,8 @@ AttributeTypes.getContentType = function (pAttributeType)
*/
AttributeTypes.getEntityField = function (pAttributeType)
{
if (pAttributeType in AttributeTypes._attributeTypeConfig)
return AttributeTypes._attributeTypeConfig[pAttributeType].entityField;
if (pAttributeType in AttributeTypes)
return AttributeTypes[pAttributeType].entityField;
return null;
}
......@@ -221,8 +212,8 @@ AttributeTypes.getEntityField = function (pAttributeType)
*/
AttributeTypes.getDatabaseField = function (pAttributeType)
{
if (pAttributeType in AttributeTypes._attributeTypeConfig)
return AttributeTypes._attributeTypeConfig[pAttributeType].databaseField;
if (pAttributeType in AttributeTypes)
return AttributeTypes[pAttributeType].databaseField;
return null;
}
......@@ -235,25 +226,7 @@ AttributeTypes.getDatabaseField = function (pAttributeType)
*/
AttributeTypes.getName = function (pAttributeType)
{
if (pAttributeType in AttributeTypes._attributeTypeConfig)
return translate.text(AttributeTypes._attributeTypeConfig[pAttributeType].name);
if (pAttributeType in AttributeTypes)
return translate.text(AttributeTypes[pAttributeType].displayName);
return null;
}
/**
* Makes a two-dimensional array of the attribute types and the corresponding names.
* This is used for the selection of the type when creating an attribute.
*
* @return {String[][]} array with attribute types and names
*/
AttributeTypes.getTypeList = function ()
{
return [
[AttributeTypes.TEXT, AttributeTypes.getName(AttributeTypes.TEXT)],
[AttributeTypes.COMBO, AttributeTypes.getName(AttributeTypes.COMBO)],
[AttributeTypes.NUMBER, AttributeTypes.getName(AttributeTypes.NUMBER)],
[AttributeTypes.DATE, AttributeTypes.getName(AttributeTypes.DATE)],
[AttributeTypes.BOOLEAN, AttributeTypes.getName(AttributeTypes.BOOLEAN)],
[AttributeTypes.GROUP, AttributeTypes.getName(AttributeTypes.GROUP)]
];
}
process/Keyword_lib/process.js
+ 2
− 0
View file @ 0bd36e2a
......@@ -23,6 +23,7 @@ function $KeywordRegistry(){}
//static property
$KeywordRegistry.get = {
AttributeType: "AttributeType",
KeywordAttributeType: "KeywordAttributeType",
ContractPayment: "ContractPayment",
ContractStatus: "ContractStatus",
......@@ -43,6 +44,7 @@ $KeywordRegistry.get = {
SalesorderState: "SalesorderState",
SalesprojectWonLost: "SalesprojectWonLost",
StockWarehouse: "StockWarehouse",
SalesprojectProbability: "SalesprojectProbability",
"null": null
};
......
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