Skip to content
Snippets Groups Projects
Commit fe20ada6 authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

merged origin/#1063252-Eigenschaften_leer into master

parents c8e5e301 5c1f3cc9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 82 additions and 2 deletions
.liquibase/Data_alias/basic/2020.2.0/ImportFields/alterLead.xml 0 → 100644
+ 9
− 0
View file @ fe20ada6
<?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.pongratz" id="99f19a82-62aa-41fc-b756-da4da3be45de">
<sql>
ALTER TABLE LEAD ADD COLUMN ATTRIBUTE_Industry VARCHAR(100);
</sql>
</changeSet>
</databaseChangeLog>
.liquibase/Data_alias/basic/2020.2.0/ImportFields/changelog.xml 0 → 100644
+ 7
− 0
View file @ fe20ada6
<?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">
<include file="insertAttributeUsage.xml" relativeToChangelogFile="true"/>
<include file="insertKewordsImportFields.xml" relativeToChangelogFile="true"/>
<include file="alterLead.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>
.liquibase/Data_alias/basic/2020.2.0/ImportFields/insertAttributeUsage.xml 0 → 100644
+ 16
− 0
View file @ fe20ada6
<?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.pongratz" id="2cc85c98-51e4-48c6-bb22-bf0bee6055f7">
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="b0d675fc-0f86-476d-89d2-64d8273f9644"/>
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="OBJECT_TYPE" value="Leadimport"/>
</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="01d6548e-c73f-4d61-8407-ba815d07fee7"/>
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="OBJECT_TYPE" value="Leadimport"/>
</insert>
</changeSet>
</databaseChangeLog>
.liquibase/Data_alias/basic/2020.2.0/ImportFields/insertKewordsImportFields.xml 0 → 100644
+ 33
− 0
View file @ fe20ada6
<?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.pongratz" id="d058a476-66c8-414e-ab2e-d132513d90ad">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="8c24ac4a-23cc-4a16-98a0-362e72b77977"/>
<column name="KEYID" value="ATTRIBUTE_Loyalty"/>
<column name="TITLE" value="Loyalty"/>
<column name="CONTAINER" value="ImportFields"/>
<column name="SORTING" valueNumeric="26"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="cb227318-924a-4df4-af98-eb6814ce21a1"/>
<column name="KEYID" value="ATTRIBUTE_Industry"/>
<column name="TITLE" value="Industry"/>
<column name="CONTAINER" value="ImportFields"/>
<column name="SORTING" valueNumeric="27"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="b1cdbbda-5181-4dbd-b786-4d180c1248aa"/>
<column name="KEYID" value="CONTACTROLE"/>
<column name="TITLE" value="Contactrole"/>
<column name="CONTAINER" value="ImportFields"/>
<column name="SORTING" valueNumeric="28"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
</changeSet>
</databaseChangeLog>
.liquibase/Data_alias/basic/2020.2.0/changelog.xml
+ 1
− 0
View file @ fe20ada6
......@@ -2,4 +2,5 @@
<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="Classification/changelog.xml"/>
<include relativeToChangelogFile="true" file="ImportFields/changelog.xml"/>
</databaseChangeLog>
process/Leadimport_lib/process.js
+ 16
− 2
View file @ fe20ada6
......@@ -381,8 +381,14 @@ LeadImportUtils.insertAttr = function(pDataFields, pDataTypes, pFieldDef, pLeadV
if (pFieldDef[i][1].substr(0, 9) == "ATTRIBUTE" && pFieldDef[i][2] != undefined)//if Attribute
{
var attrdata = pFieldDef[i][2];
let countAttributes = newSelect("count(*)")
.from("AB_ATTRIBUTERELATION")
.where("AB_ATTRIBUTERELATION.OBJECT_ROWID", pContactId)
.and("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", attrdata[1][0])
.cell();
if (attrdata[2][pObjectID] != undefined)//e. g. if attrdata[2]["Organisation"] != undefined
if (attrdata[2][pObjectID] != undefined && countAttributes == 0)//e. g. if attrdata[2]["Organisation"] != undefined
{
var DataValues = new Object();
var value = pLeadValues[pFieldDef[i][1]];
......@@ -694,7 +700,15 @@ LeadImportUtils.sqlInsertAttr = function(pAttrObject, pAttrValues, pUser, pDate)
pAttrValues[9] = pUser;
pAttrValues[10] = pDate;
db.insertData("AB_ATTRIBUTERELATION", pAttrObject["Fields"] , pAttrObject["Types"], pAttrValues);
let countAttributes = newSelect("count(*)")
.from("AB_ATTRIBUTERELATION")
.where("AB_ATTRIBUTERELATION.OBJECT_ROWID", AttrValues[7])
.and("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", attrdata[1][0])
.cell();
if (countAttributes == 0) {
db.insertData("AB_ATTRIBUTERELATION", pAttrObject["Fields"] , pAttrObject["Types"], pAttrValues);
}
}
/**
......
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