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

merged Task into master

parents f8afb8b5 6335a3c5
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 17775 additions and 17403 deletions
.liquibase/Data_alias/basic/2019.2/AditoBasic/ab_keyword_attributerelation_add_longtext_type.xml 0 → 100644
+ 18
− 0
View file @ 84f0d451
<?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="n.bugl" id="65c6bfc8-5de5-479e-8d64-a93cffe8ce89">
<addColumn tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="LONG_CHAR_VALUE" type="NCLOB"/>
</addColumn>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="f3c4cf95-edb6-4637-9186-9ba25ebf927d"/>
<column name="KEYID" value="LONG_CHAR_VALUE"/>
<column name="TITLE" value="Long string value"/>
<column name="CONTAINER" value="KeywordAttributeType"/>
<column name="SORTING" valueNumeric="3"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2019.2/Ticketmanagement/insert_TaskType_Task.xml
+ 24
− 6
View file @ 84f0d451
<?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.hoermann" id="d1440b93-e01c-406b-9f0d-c55cac877fcd">
<changeSet author="j.hoermann" id="d1440b93-e01c-406b-9f0d-c55cac877fcd">
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="e8e3e2e9-8cce-4582-a71b-7f66593c7ade"/>
<column name="NAME" value="group"/>
......@@ -11,13 +11,13 @@
<column name="AB_KEYWORD_ATTRIBUTEID" value="af6a0af9-0102-426b-a1f7-c8abfea79793"/>
<column name="NAME" value="attributes"/>
<column name="CONTAINER" value="TaskType"/>
<column name="TYPE" value="CHAR_VALUE"/>
<column name="TYPE" value="LONG_CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="6f10015d-b7ee-43aa-99f9-87960ec2e4fd"/>
<column name="NAME" value="availableStatus"/>
<column name="CONTAINER" value="TaskType"/>
<column name="TYPE" value="CHAR_VALUE"/>
<column name="TYPE" value="LONG_CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="729a41d1-0463-480d-bf7b-0eb6c2e96f37"/>
......@@ -44,6 +44,12 @@
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="9ac96671-b519-488b-bbad-6dea3e5baafd"/>
<column name="BOOL_VALUE" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="17afe435-c498-45f7-8a16-50d50b78926a"/>
<column name="AB_KEYWORD_ENTRY_ID" value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="6f10015d-b7ee-43aa-99f9-87960ec2e4fd"/>
<column name="LONG_CHAR_VALUE" value="[&quot;21bc4d20-1a87-4247-8f7c-8d3a09631850&quot;, &quot;b1fd456f-f5d2-459e-b467-76e2914c8169&quot;, &quot;00595a73-22e2-4c3b-a21c-06bdec262d20&quot;, &quot;7c9d6681-6cf5-4395-b276-3941b6fd0d57&quot;]"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="169edc60-5bad-45eb-b938-46a47b10a0a3"/>
<column name="AB_KEYWORD_ENTRY_ID" value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
......@@ -70,7 +76,13 @@
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="fa35bb8d-1aa6-47fd-a674-0fdb7c838ddd"/>
<column name="AB_KEYWORD_ENTRY_ID" value="2ef84e0e-988a-44b4-9d14-3461555d2f18"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="af6a0af9-0102-426b-a1f7-c8abfea79793"/>
<column name="CHAR_VALUE" value="[&quot;ff8b1caf-cf30-4edb-b5ca-a9a219ba8399&quot;]"/>
<column name="LONG_CHAR_VALUE" value="[&quot;ff8b1caf-cf30-4edb-b5ca-a9a219ba8399&quot;]"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="9b4f5103-be45-4f71-b841-c3e19cc19786"/>
<column name="AB_KEYWORD_ENTRY_ID" value="2ef84e0e-988a-44b4-9d14-3461555d2f18"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="6f10015d-b7ee-43aa-99f9-87960ec2e4fd"/>
<column name="LONG_CHAR_VALUE" value="[&quot;21bc4d20-1a87-4247-8f7c-8d3a09631850&quot;, &quot;b1fd456f-f5d2-459e-b467-76e2914c8169&quot;, &quot;00595a73-22e2-4c3b-a21c-06bdec262d20&quot;, &quot;7c9d6681-6cf5-4395-b276-3941b6fd0d57&quot;]"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="4cabba92-fa98-42c8-aabb-8bff718c1502"/>
......@@ -98,13 +110,19 @@
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="7f1bed92-7158-4c89-b811-85dea257fa6a"/>
<column name="AB_KEYWORD_ENTRY_ID" value="9d326a2a-923c-41de-adb9-b0f86417e7c2"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="af6a0af9-0102-426b-a1f7-c8abfea79793"/>
<column name="CHAR_VALUE" value="[]"/>
<column name="LONG_CHAR_VALUE" value="[]"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="2878a3ac-83a3-4e19-be73-da5db8d78375"/>
<column name="AB_KEYWORD_ENTRY_ID" value="9d326a2a-923c-41de-adb9-b0f86417e7c2"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="6f10015d-b7ee-43aa-99f9-87960ec2e4fd"/>
<column name="LONG_CHAR_VALUE" value="[&quot;38cfe962-5842-4c7d-9e7f-a26ab0578321&quot;, &quot;e20fd681-b5ff-4d7e-a62b-16f949aa0486&quot;, &quot;b1fd456f-f5d2-459e-b467-76e2914c8169&quot;, &quot;00595a73-22e2-4c3b-a21c-06bdec262d20&quot;, &quot;91869bd5-ec33-4dcc-a86c-ae55b75538a0&quot;, &quot;bfd2af05-83b4-4000-99b1-ed680dca4965&quot;, &quot;cfbc9e01-2530-472a-9cd1-466c62dcbebf&quot;, &quot;4a3ae1ca-35f0-404b-bde5-f13987be8421&quot;]"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="b7d946e4-3644-4f97-96cb-f2331fc3aa1e"/>
<column name="AB_KEYWORD_ENTRY_ID" value="9d326a2a-923c-41de-adb9-b0f86417e7c2"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="729a41d1-0463-480d-bf7b-0eb6c2e96f37"/>
<column name="CHAR_VALUE" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
<column name="CHAR_VALUE" value="38cfe962-5842-4c7d-9e7f-a26ab0578321"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2019.2/Ticketmanagement/update_TaskStatus_add_icon.xml deleted 100644 → 0
+ 0
− 36
View file @ f8afb8b5
<?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.hoermann" id="d1440b93-e01c-406b-9f0d-c55cac877fcd">
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
<column name="NAME" value="icon"/>
<column name="CONTAINER" value="TaskStatus"/>
<column name="TYPE" value="CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="3a2e147c-614e-49ae-8b7e-16a8a16d0c05"/>
<column name="AB_KEYWORD_ENTRY_ID" value="6ab0cc9e-021c-42ef-abfd-f9f7a58aa76c"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
<column name="CHAR_VALUE" value="NEON:STATUS_NOT_STARTED"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="f0ec52a0-81f1-43b7-bb5b-d9e925d525aa"/>
<column name="AB_KEYWORD_ENTRY_ID" value="6a479d71-2c05-4496-9c6c-c9aeef929bcf"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
<column name="CHAR_VALUE" value="NEON:STATUS_IN_PROGRESS"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="9b9eac4b-886b-46b1-a099-2ead6cfbc99d"/>
<column name="AB_KEYWORD_ENTRY_ID" value="34701d4d-7435-43bc-8b2f-ad2a70065a75"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
<column name="CHAR_VALUE" value="NEON:STATUS_WAITING"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="7f4d36bd-4ab2-4ccc-bdf5-ae05d817c255"/>
<column name="AB_KEYWORD_ENTRY_ID" value="7311d8c5-edf2-492e-be4d-6f0469334611"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
<column name="CHAR_VALUE" value="NEON:STATUS_DONE"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2019.2/Ticketmanagement/update_TaskStatus_add_icon_and_new_status.xml 0 → 100644
+ 161
− 0
View file @ 84f0d451
<?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.hoermann" id="d1440b93-e01c-406b-9f0d-c55cac877fcd">
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
<column name="NAME" value="icon"/>
<column name="CONTAINER" value="TaskStatus"/>
<column name="TYPE" value="CHAR_VALUE"/>
</insert>
<!-- new -->
<update tableName="AB_KEYWORD_ENTRY">
<column name="SORTING" valueNumeric="10"/>
<where>AB_KEYWORD_ENTRYID = '6ab0cc9e-021c-42ef-abfd-f9f7a58aa76c'</where>
</update>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="3a2e147c-614e-49ae-8b7e-16a8a16d0c05"/>
<column name="AB_KEYWORD_ENTRY_ID" value="6ab0cc9e-021c-42ef-abfd-f9f7a58aa76c"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
<column name="CHAR_VALUE" value="NEON:STATUS_NOT_STARTED"/>
</insert>
<!-- unassigned -->
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="0b06db5c-1d00-4d01-b8a9-f280a4f69cbc"/>
<column name="KEYID" value="38cfe962-5842-4c7d-9e7f-a26ab0578321"/>
<column name="TITLE" value="unassigned"/>
<column name="CONTAINER" value="TaskStatus"/>
<column name="SORTING" valueNumeric="20"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="cd121a8b-7a7f-4cc1-a0ad-1f82444b549c"/>
<column name="AB_KEYWORD_ENTRY_ID" value="0b06db5c-1d00-4d01-b8a9-f280a4f69cbc"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
<column name="CHAR_VALUE" value="NEON:STATUS_NOT_STARTED"/>
</insert>
<!-- assigned -->
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="1061168a-4b17-4ba5-be70-948c0dd78f20"/>
<column name="KEYID" value="e20fd681-b5ff-4d7e-a62b-16f949aa0486"/>
<column name="TITLE" value="assigned"/>
<column name="CONTAINER" value="TaskStatus"/>
<column name="SORTING" valueNumeric="30"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="d20606fe-776f-4f44-b2f1-504e0066398a"/>
<column name="AB_KEYWORD_ENTRY_ID" value="1061168a-4b17-4ba5-be70-948c0dd78f20"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
<column name="CHAR_VALUE" value="NEON:STATUS_NOT_STARTED"/>
</insert>
<!-- in process -->
<update tableName="AB_KEYWORD_ENTRY">
<column name="SORTING" valueNumeric="40"/>
<where>AB_KEYWORD_ENTRYID = '6a479d71-2c05-4496-9c6c-c9aeef929bcf'</where>
</update>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="f0ec52a0-81f1-43b7-bb5b-d9e925d525aa"/>
<column name="AB_KEYWORD_ENTRY_ID" value="6a479d71-2c05-4496-9c6c-c9aeef929bcf"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
<column name="CHAR_VALUE" value="NEON:STATUS_IN_PROGRESS"/>
</insert>
<!-- waiting -->
<update tableName="AB_KEYWORD_ENTRY">
<column name="SORTING" valueNumeric="50"/>
<where>AB_KEYWORD_ENTRYID = '34701d4d-7435-43bc-8b2f-ad2a70065a75'</where>
</update>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="9b9eac4b-886b-46b1-a099-2ead6cfbc99d"/>
<column name="AB_KEYWORD_ENTRY_ID" value="34701d4d-7435-43bc-8b2f-ad2a70065a75"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
<column name="CHAR_VALUE" value="NEON:STATUS_WAITING"/>
</insert>
<!-- ended -->
<update tableName="AB_KEYWORD_ENTRY">
<column name="SORTING" valueNumeric="60"/>
<where>AB_KEYWORD_ENTRYID = '7311d8c5-edf2-492e-be4d-6f0469334611'</where>
</update>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="7f4d36bd-4ab2-4ccc-bdf5-ae05d817c255"/>
<column name="AB_KEYWORD_ENTRY_ID" value="7311d8c5-edf2-492e-be4d-6f0469334611"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
<column name="CHAR_VALUE" value="NEON:STATUS_DONE"/>
</insert>
<!-- ended (done) -->
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="890a7832-f06f-4e51-8744-73aa8ddea4f8"/>
<column name="KEYID" value="91869bd5-ec33-4dcc-a86c-ae55b75538a0"/>
<column name="TITLE" value="ended (done)"/>
<column name="CONTAINER" value="TaskStatus"/>
<column name="SORTING" valueNumeric="70"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="7c8c74a2-0f9b-4491-9c97-38a380d77b2c"/>
<column name="AB_KEYWORD_ENTRY_ID" value="890a7832-f06f-4e51-8744-73aa8ddea4f8"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
<column name="CHAR_VALUE" value="NEON:STATUS_DONE"/>
</insert>
<!-- ended (abandoned) -->
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="a5b50ba3-0fb9-4fbe-9e98-4d6c53b329af"/>
<column name="KEYID" value="bfd2af05-83b4-4000-99b1-ed680dca4965"/>
<column name="TITLE" value="ended (abandoned)"/>
<column name="CONTAINER" value="TaskStatus"/>
<column name="SORTING" valueNumeric="80"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="eb632e72-2014-468e-8abc-43e5a5e41875"/>
<column name="AB_KEYWORD_ENTRY_ID" value="a5b50ba3-0fb9-4fbe-9e98-4d6c53b329af"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
<column name="CHAR_VALUE" value="NEON:STATUS_DONE"/>
</insert>
<!-- still incorrect -->
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="9d4cdd61-9f6a-46e1-bef0-eaf16613aea5"/>
<column name="KEYID" value="cfbc9e01-2530-472a-9cd1-466c62dcbebf"/>
<column name="TITLE" value="still incorrect"/>
<column name="CONTAINER" value="TaskStatus"/>
<column name="SORTING" valueNumeric="90"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="f9e2f0b3-baca-4a26-bc9f-b42b6dc1ef9e"/>
<column name="AB_KEYWORD_ENTRY_ID" value="9d4cdd61-9f6a-46e1-bef0-eaf16613aea5"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
<column name="CHAR_VALUE" value="NEON:STATUS_WAITING"/>
</insert>
<!-- customer checks -->
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="2f742253-c287-40ab-838f-ec797a16fdce"/>
<column name="KEYID" value="4a3ae1ca-35f0-404b-bde5-f13987be8421"/>
<column name="TITLE" value="customer checks"/>
<column name="CONTAINER" value="TaskStatus"/>
<column name="SORTING" valueNumeric="100"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="8a01f326-f629-44ca-be1e-5b9dbc0ef06d"/>
<column name="AB_KEYWORD_ENTRY_ID" value="2f742253-c287-40ab-838f-ec797a16fdce"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
<column name="CHAR_VALUE" value="NEON:STATUS_WAITING"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2019.2/changelog.xml
+ 2
− 1
View file @ 84f0d451
......@@ -182,9 +182,10 @@
<include relativeToChangelogFile="true" file="AditoBasic/insert_permission_keyword.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/ab_keyword_attributerelation_add_longtext_type.xml"/>
<include relativeToChangelogFile="true" file="Ticketmanagement/insertTicketAttributes_TaskType_Task.xml"/>
<include relativeToChangelogFile="true" file="Ticketmanagement/insert_TaskType_Task.xml"/>
<include relativeToChangelogFile="true" file="Ticketmanagement/update_TaskStatus_add_icon.xml"/>
<include relativeToChangelogFile="true" file="Ticketmanagement/update_TaskStatus_add_icon_and_new_status.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/salesprojectsource_add_icon_attr.xml"/>
......
aliasDefinition/Data_alias/Data_alias.aod
+ 9843
− 9725
View file @ 84f0d451
This diff is collapsed.
entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
+ 171
− 164
View file @ 84f0d451
<?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.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
<name>KeywordAttributeRelation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/documentation.adoc</documentation>
<title>Keyword Attribute Values</title>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
<entityField>
<name>AB_KEYWORD_ATTRIBUTERELATIONID</name>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attributerelationid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>CHAR_VALUE</name>
<title>CHAR_VALUE</title>
</entityField>
<entityField>
<name>NUMBER_VALUE</name>
<contentType>NUMBER</contentType>
</entityField>
<entityField>
<name>BOOL_VALUE</name>
<contentType>BOOLEAN</contentType>
</entityField>
<entityField>
<name>AB_KEYWORD_ATTRIBUTE_ID</name>
<title>Keyword Attribute</title>
<consumer>KeywordAttributes</consumer>
<mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attribute_id/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attribute_id/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>AB_KEYWORD_ENTRY_ID</name>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_entry_id/valueProcess.js</valueProcess>
</entityField>
<entityProvider>
<name>AttributesForKeywordEntry</name>
<titlePlural></titlePlural>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>490d12c0-6ace-42e5-89e1-d40b25322161</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>KeywordAttributeRelations</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>53b35858-7c81-429c-9e06-0362f567ad42</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>KeywordAttributeRelationsReadOnly</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>KeywordEntryId_param</name>
<expose v="true" />
<triggerRecalculation v="false" />
<mandatory v="false" />
</entityParameter>
</children>
</entityProvider>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/containername_param/valueProcess.js</valueProcess>
<triggerRecalculation v="true" />
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
<name>KeywordAttributes</name>
<dependency>
<name>dependency</name>
<entityName>KeywordAttribute_entity</entityName>
<fieldName>SpecificContainerKeyword</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/containername_param/valueProcess.js</valueProcess>
<expose v="false" />
<triggerRecalculation v="false" />
</entityParameter>
<entityParameter>
<name>FilterAlreadyUsedByEntryId_param</name>
<valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/valueProcess.js</valueProcess>
<expose v="false" />
</entityParameter>
</children>
</entityConsumer>
<entityParameter>
<name>KeywordEntryId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityField>
<name>valueProxy</name>
<documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/documentation.adoc</documentation>
<title>Value</title>
<contentTypeProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js</contentTypeProcess>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/valueProcess.js</valueProcess>
<onValueChange>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>attributeType</name>
<valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/attributetype/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<linkInformation>
<linkInformation>
<name>8e2938d2-e14b-403b-8ae5-875f70bc3f85</name>
<tableName>AB_KEYWORD_ATTRIBUTERELATION</tableName>
<primaryKey>AB_KEYWORD_ATTRIBUTERELATIONID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>AB_KEYWORD_ATTRIBUTERELATIONID.value</name>
<recordfield>AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTERELATIONID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>BOOL_VALUE.value</name>
<recordfield>AB_KEYWORD_ATTRIBUTERELATION.BOOL_VALUE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CHAR_VALUE.value</name>
<recordfield>AB_KEYWORD_ATTRIBUTERELATION.CHAR_VALUE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>NUMBER_VALUE.value</name>
<recordfield>AB_KEYWORD_ATTRIBUTERELATION.NUMBER_VALUE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>AB_KEYWORD_ATTRIBUTE_ID.value</name>
<recordfield>AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTE_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>AB_KEYWORD_ENTRY_ID.value</name>
<recordfield>AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ENTRY_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>AB_KEYWORD_ATTRIBUTE_ID.displayValue</name>
<expression>%aditoprj%/entity/KeywordAttributeRelation_entity/recordcontainers/db/recordfieldmappings/ab_keyword_attribute_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
</entity>
<?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.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
<name>KeywordAttributeRelation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/documentation.adoc</documentation>
<title>Keyword Attribute Values</title>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
<entityField>
<name>AB_KEYWORD_ATTRIBUTERELATIONID</name>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attributerelationid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>CHAR_VALUE</name>
<title>CHAR_VALUE</title>
</entityField>
<entityField>
<name>NUMBER_VALUE</name>
<contentType>NUMBER</contentType>
</entityField>
<entityField>
<name>BOOL_VALUE</name>
<contentType>BOOLEAN</contentType>
</entityField>
<entityField>
<name>AB_KEYWORD_ATTRIBUTE_ID</name>
<title>Keyword Attribute</title>
<consumer>KeywordAttributes</consumer>
<mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attribute_id/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attribute_id/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>AB_KEYWORD_ENTRY_ID</name>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_entry_id/valueProcess.js</valueProcess>
</entityField>
<entityProvider>
<name>AttributesForKeywordEntry</name>
<titlePlural></titlePlural>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>490d12c0-6ace-42e5-89e1-d40b25322161</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>KeywordAttributeRelations</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>53b35858-7c81-429c-9e06-0362f567ad42</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>KeywordAttributeRelationsReadOnly</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>KeywordEntryId_param</name>
<expose v="true" />
<triggerRecalculation v="false" />
<mandatory v="false" />
</entityParameter>
</children>
</entityProvider>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/containername_param/valueProcess.js</valueProcess>
<triggerRecalculation v="true" />
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
<name>KeywordAttributes</name>
<dependency>
<name>dependency</name>
<entityName>KeywordAttribute_entity</entityName>
<fieldName>SpecificContainerKeyword</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/containername_param/valueProcess.js</valueProcess>
<expose v="false" />
<triggerRecalculation v="false" />
</entityParameter>
<entityParameter>
<name>FilterAlreadyUsedByEntryId_param</name>
<valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/valueProcess.js</valueProcess>
<expose v="false" />
</entityParameter>
</children>
</entityConsumer>
<entityParameter>
<name>KeywordEntryId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityField>
<name>valueProxy</name>
<documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/documentation.adoc</documentation>
<title>Value</title>
<contentTypeProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js</contentTypeProcess>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/valueProcess.js</valueProcess>
<onValueChange>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>attributeType</name>
<valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/attributetype/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>LONG_CHAR_VALUE</name>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<linkInformation>
<linkInformation>
<name>8e2938d2-e14b-403b-8ae5-875f70bc3f85</name>
<tableName>AB_KEYWORD_ATTRIBUTERELATION</tableName>
<primaryKey>AB_KEYWORD_ATTRIBUTERELATIONID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>AB_KEYWORD_ATTRIBUTERELATIONID.value</name>
<recordfield>AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTERELATIONID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>BOOL_VALUE.value</name>
<recordfield>AB_KEYWORD_ATTRIBUTERELATION.BOOL_VALUE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CHAR_VALUE.value</name>
<recordfield>AB_KEYWORD_ATTRIBUTERELATION.CHAR_VALUE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>NUMBER_VALUE.value</name>
<recordfield>AB_KEYWORD_ATTRIBUTERELATION.NUMBER_VALUE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>AB_KEYWORD_ATTRIBUTE_ID.value</name>
<recordfield>AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTE_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>AB_KEYWORD_ENTRY_ID.value</name>
<recordfield>AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ENTRY_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>AB_KEYWORD_ATTRIBUTE_ID.displayValue</name>
<expression>%aditoprj%/entity/KeywordAttributeRelation_entity/recordcontainers/db/recordfieldmappings/ab_keyword_attribute_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>LONG_CHAR_VALUE.value</name>
<recordfield>AB_KEYWORD_ATTRIBUTERELATION.LONG_CHAR_VALUE</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
</entity>
entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attribute_id/onValueChange.js
+ 1
− 0
View file @ 84f0d451
......@@ -5,6 +5,7 @@ var recordState = vars.get("$sys.recordstate");
if (recordState == neon.OPERATINGSTATE_NEW || recordState == neon.OPERATINGSTATE_EDIT)
{
vars.set("$field.CHAR_VALUE", null);
vars.set("$field.LONG_CHAR_VALUE", null);
vars.set("$field.BOOL_VALUE", null);
vars.set("$field.NUMBER_VALUE", null);
}
\ No newline at end of file
entity/KeywordAttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js
+ 3
− 0
View file @ 84f0d451
......@@ -13,6 +13,9 @@ switch(type)
case "CHAR_VALUE":
contentType = "TEXT";
break;
case "LONG_CHAR_VALUE":
contentType = "LONG_TEXT";
break;
default:
contentType = "UNKNOWN";
break;
......
entity/KeywordAttributeRelation_entity/entityfields/valueproxy/onValueChange.js
+ 3
− 0
View file @ 84f0d451
......@@ -15,4 +15,7 @@ switch (type)
case "CHAR_VALUE":
vars.set("$field.CHAR_VALUE", value);
break;
case "LONG_CHAR_VALUE":
vars.set("$field.LONG_CHAR_VALUE", value);
break;
}
entity/KeywordAttributeRelation_entity/entityfields/valueproxy/valueProcess.js
+ 3
− 0
View file @ 84f0d451
......@@ -13,6 +13,9 @@ switch (type)
break;
case "CHAR_VALUE":
value = vars.get("$field.CHAR_VALUE");
break;
case "LONG_CHAR_VALUE":
value = vars.get("$field.LONG_CHAR_VALUE");
break;
default:
value = null;
......
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+ 3737
− 3719
View file @ 84f0d451
This diff is collapsed.
language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+ 28
− 0
View file @ 84f0d451
......@@ -41,6 +41,10 @@
<key>Do you really want to delete this recurring appointment?</key>
<value>Wollen Sie wirklich die Serie löschen?</value>
</entry>
<entry>
<key>Long string value</key>
<value>Langer String-Wert</value>
</entry>
<entry>
<key>Advertising bans</key>
<value>Werbesperren</value>
......@@ -129,10 +133,18 @@
<key>Single</key>
<value>Einzel</value>
</entry>
<entry>
<key>ended (abandoned)</key>
<value>abgeschlossen (aufgegeben)</value>
</entry>
<entry>
<key>Entrydate (Day)</key>
<value>Eingangsdatum (Tag)</value>
</entry>
<entry>
<key>still incorrect</key>
<value>weiterhin fehlerhaft</value>
</entry>
<entry>
<key>Priority</key>
<value>Priorität</value>
......@@ -560,6 +572,10 @@
<key>archieve</key>
<value>Archivieren</value>
</entry>
<entry>
<key>ended (done)</key>
<value>abgeschlossen (erledigt)</value>
</entry>
<entry>
<key>Document Template</key>
<value>Dokumentvorlage</value>
......@@ -1310,6 +1326,10 @@
<key>Put Reciever Into To</key>
<value>Bitte einen Adressat in 'to' eintragen!</value>
</entry>
<entry>
<key>customer checks</key>
<value>Kunde prüft</value>
</entry>
<entry>
<key>History</key>
<value>Verlauf</value>
......@@ -2284,6 +2304,10 @@
<key>Inactive</key>
<value>Inaktiv</value>
</entry>
<entry>
<key>unassigned</key>
<value>nicht zugewiesen</value>
</entry>
<entry>
<key>France</key>
<value>Frankreich</value>
......@@ -4420,6 +4444,10 @@
<key>Possible Values</key>
<value>Mögliche Werte</value>
</entry>
<entry>
<key>assigned</key>
<value>zugewiesen</value>
</entry>
<entry>
<key>251 to 1,000</key>
</entry>
......
language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+ 3765
− 3747
View file @ 84f0d451
This diff is collapsed.
process/ActivityTask_lib/process.js
+ 2
− 0
View file @ 84f0d451
import("system.logging");
import("system.vars");
import("system.util");
import("system.datetime");
......@@ -131,6 +132,7 @@ TaskUtils.getTypeAttributes = function(pType)
TaskUtils.getAvailableStatus = function(pType)
{
logging.log("hääää" + KeywordUtils.getAttributeRelation(pType, $KeywordRegistry.taskType(), "availableStatus", ""))
return JSON.parse(KeywordUtils.getAttributeRelation(pType, $KeywordRegistry.taskType(), "availableStatus", ""));
}
......
process/KeywordData_lib/process.js
+ 8
− 4
View file @ 84f0d451
import("system.logging");
import("system.translate");
import("system.db");
import("DataCaching_lib");
......@@ -52,7 +53,7 @@ KeywordData.getKeywordAttributeRelations = function (pKeywordContainer)
.andPrepare("AB_KEYWORD_ENTRY.CONTAINER", pKeywordContainer);
var sql = cond.buildSql("select AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ATTRIBUTE.NAME, AB_KEYWORD_ATTRIBUTE.TYPE, \n\
AB_KEYWORD_ATTRIBUTERELATION.CHAR_VALUE, AB_KEYWORD_ATTRIBUTERELATION.NUMBER_VALUE, AB_KEYWORD_ATTRIBUTERELATION.BOOL_VALUE \n\
AB_KEYWORD_ATTRIBUTERELATION.CHAR_VALUE, AB_KEYWORD_ATTRIBUTERELATION.LONG_CHAR_VALUE, AB_KEYWORD_ATTRIBUTERELATION.NUMBER_VALUE, AB_KEYWORD_ATTRIBUTERELATION.BOOL_VALUE \n\
from AB_KEYWORD_ENTRY \n\
join AB_KEYWORD_ATTRIBUTE on (AB_KEYWORD_ATTRIBUTE.CONTAINER = AB_KEYWORD_ENTRY.CONTAINER) \n\
left join AB_KEYWORD_ATTRIBUTERELATION \n\
......@@ -61,11 +62,11 @@ KeywordData.getKeywordAttributeRelations = function (pKeywordContainer)
var data = db.table(sql);
var res = {};
var keyId, name, type, charVal, numVal, boolVal;
var keyId, name, type, charVal, longCharVal, numVal, boolVal;
for (var i = 0, l = data.length; i < l; i++)
{
[keyId, name, type, charVal, numVal, boolVal] = data[i];
[keyId, name, type, charVal, longCharVal, numVal, boolVal] = data[i];
name = name.trim();
type = type.trim();
if (res[keyId] == undefined)
......@@ -83,13 +84,16 @@ KeywordData.getKeywordAttributeRelations = function (pKeywordContainer)
case "CHAR_VALUE":
parsedValue = charVal == "" ? null : charVal;
break;
case "LONG_CHAR_VALUE":
parsedValue = longCharVal == "" ? null : longCharVal;
break;
}
res[keyId][name] = parsedValue;
}
return res;
});
logging.log(data.toSource());
return data;
}
......
process/Keyword_lib/process.js
+ 6
− 1
View file @ 84f0d451
import("system.logging");
import("KeywordRegistry_basic");
import("KeywordData_lib");
import("system.vars");
......@@ -70,7 +71,7 @@ KeywordUtils.getAttributeRelationsByKey = function(pKeyId, pContainerName)
return "";
var data = KeywordData.getKeywordAttributeRelations(pContainerName);
logging.log("byKey " + data.toSource())
if (data[pKeyId] == undefined)
return {};
else
......@@ -91,6 +92,10 @@ KeywordUtils.getAttributeRelationsByKey = function(pKeyId, pContainerName)
KeywordUtils.getAttributeRelation = function(pKeyId, pContainerName, pAttrName, pDefault)
{
var attributes = KeywordUtils.getAttributeRelationsByKey(pKeyId, pContainerName);
logging.log("getRel " + attributes.toSource());
logging.log("ggggg " + pAttrName);
logging.log("ggggg " + pKeyId);
logging.log("ggggg " + attributes[pAttrName]);
if (attributes && attributes[pAttrName] != null)
{
return attributes[pAttrName];
......
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