diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod index 60690290355c44e758aa005901041bca2059a76c..032b0ad1c4c1cebdd8fcc2be3aeec18c2ff3cd1c 100644 --- a/aliasDefinition/Data_alias/Data_alias.aod +++ b/aliasDefinition/Data_alias/Data_alias.aod @@ -13225,118 +13225,4 @@ </entityGroup> </aliasDefDb> </aliasDefinitionSub> - <indexSearchGroups> - <indexSearchGroup> - <name>ORGANISATION</name> - <title>Company</title> - <icon>VAADIN:BUILDING</icon> - <idColumn>CONTACTID</idColumn> - <titleColumn>TITLECOLUMN</titleColumn> - <descriptionColumn>DESCCOLUMN</descriptionColumn> - <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js</query> - <subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/organisation/subQueries.js</subQueries> - <resultContextNeon>Organisation</resultContextNeon> - <affectedTables> - <element>ADDRESS</element> - <element>COMMUNICATION</element> - <element>CONTACT</element> - <element>ORGANISATION</element> - </affectedTables> - <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js</affectedIds> - </indexSearchGroup> - <indexSearchGroup> - <name>PERSON</name> - <title>Contact</title> - <icon>VAADIN:USERS</icon> - <idColumn>CONTACTID</idColumn> - <titleColumn>TITLECOLUMN</titleColumn> - <descriptionColumn>DESCCOLUMN</descriptionColumn> - <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/person/query.js</query> - <subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/person/subQueries.js</subQueries> - <resultContextNeon>Person</resultContextNeon> - <affectedTables> - <element>ADDRESS</element> - <element>COMMUNICATION</element> - <element>PERSON</element> - <element>CONTACT</element> - <element>ORGANISATION</element> - </affectedTables> - <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/person/affectedIds.js</affectedIds> - </indexSearchGroup> - <indexSearchGroup> - <name>OFFER</name> - <title>Offer</title> - <icon>VAADIN:CART</icon> - <active v="true" /> - <idColumn>OFFERID</idColumn> - <titleColumn>TITLECOLUMN</titleColumn> - <descriptionColumn>DESCCOLUMN</descriptionColumn> - <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js</query> - <resultContextNeon>Offer</resultContextNeon> - <affectedTables> - <element>OFFER</element> - </affectedTables> - <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/offer/affectedIds.js</affectedIds> - </indexSearchGroup> - <indexSearchGroup> - <name>SALESORDER</name> - <title>Receipt</title> - <icon>VAADIN:DOLLAR</icon> - <active v="true" /> - <idColumn>SALESORDERID</idColumn> - <titleColumn>TITLECOLUMN</titleColumn> - <descriptionColumn>DESCCOLUMN</descriptionColumn> - <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js</query> - <resultContextNeon>Order</resultContextNeon> - <affectedTables> - <element>SALESORDER</element> - </affectedTables> - <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/salesorder/affectedIds.js</affectedIds> - </indexSearchGroup> - <indexSearchGroup> - <name>CONTRACT</name> - <title>Contract</title> - <icon>VAADIN:FILE_TEXT</icon> - <active v="true" /> - <idColumn>CONTRACTID</idColumn> - <titleColumn>TITLECOLUMN</titleColumn> - <descriptionColumn>DESCCOLUMN</descriptionColumn> - <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/contract/query.js</query> - <resultContextNeon>Contract</resultContextNeon> - <affectedTables> - <element>CONTRACT</element> - </affectedTables> - <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/contract/affectedIds.js</affectedIds> - </indexSearchGroup> - <indexSearchGroup> - <name>PRODUCT</name> - <title>Product</title> - <icon>VAADIN:HAMMER</icon> - <active v="true" /> - <idColumn>PRODUCTID</idColumn> - <titleColumn>TITLECOLUMN</titleColumn> - <descriptionColumn>DESCCOLUMN</descriptionColumn> - <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/product/query.js</query> - <resultContextNeon>Product</resultContextNeon> - <affectedTables> - <element>PRODUCT</element> - </affectedTables> - <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/product/affectedIds.js</affectedIds> - </indexSearchGroup> - <indexSearchGroup> - <name>SALESPROJECT</name> - <title>Salesproject</title> - <icon>VAADIN:BOOK_DOLLAR</icon> - <active v="true" /> - <idColumn>SALESPROJECTID</idColumn> - <titleColumn>TITLECOLUMN</titleColumn> - <descriptionColumn>DESCCOLUMN</descriptionColumn> - <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/salesproject/query.js</query> - <resultContextNeon>Salesproject</resultContextNeon> - <affectedTables> - <element>SALESPROJECT</element> - </affectedTables> - <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/salesproject/affectedIds.js</affectedIds> - </indexSearchGroup> - </indexSearchGroups> </aliasDefinition> diff --git a/aliasDefinition/Data_alias/indexsearchgroups/contract/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/contract/affectedIds.js deleted file mode 100644 index 548f327a66b7b08252086a013c0152cd52f8da20..0000000000000000000000000000000000000000 --- a/aliasDefinition/Data_alias/indexsearchgroups/contract/affectedIds.js +++ /dev/null @@ -1,4 +0,0 @@ -import("system.vars"); -import("system.result"); - -result.object([vars.getString("$local.idvalue")]); \ No newline at end of file diff --git a/aliasDefinition/Data_alias/indexsearchgroups/contract/query.js b/aliasDefinition/Data_alias/indexsearchgroups/contract/query.js deleted file mode 100644 index a71352e17d4c8a250376152609eb5d501fd897bf..0000000000000000000000000000000000000000 --- a/aliasDefinition/Data_alias/indexsearchgroups/contract/query.js +++ /dev/null @@ -1,27 +0,0 @@ -import("system.result"); -import("system.db"); -import("system.vars"); -import("system.translate"); -import("Keyword_lib"); -import("Sql_lib"); -import("KeywordRegistry_basic"); - -var sqlHelper = new SqlMaskingUtils(); - -var sqlQuery = newSelect("CONTRACTID as \"_uid_\", " - + sqlHelper.concat(["CONTRACTCODE", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractStatus(), "CONTRACTSTATUS")], " | ") - + " as TITLECOLUMN, " - + sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Type of contract") + ":'", - KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractType(), "CONTRACTTYPE")]) - + " as DESCCOLUMN, CONTRACTCODE, ORGANISATION.NAME, CUSTOMERCODE") - .from("CONTRACT") - .join("CONTACT", "CONTRACT.CONTACT_ID = CONTACTID") - .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID") - .orderBy("CONTRACTCODE"); - -if (vars.exists("$local.idvalue")) { - var affectedIds = vars.get("$local.idvalue"); - sqlQuery.whereIfSet("CONTRACT.CONTRACTID", affectedIds, SqlBuilder.IN()); -} - -result.string(sqlQuery.toString()); \ No newline at end of file diff --git a/aliasDefinition/Data_alias/indexsearchgroups/offer/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/offer/affectedIds.js deleted file mode 100644 index 548f327a66b7b08252086a013c0152cd52f8da20..0000000000000000000000000000000000000000 --- a/aliasDefinition/Data_alias/indexsearchgroups/offer/affectedIds.js +++ /dev/null @@ -1,4 +0,0 @@ -import("system.vars"); -import("system.result"); - -result.object([vars.getString("$local.idvalue")]); \ No newline at end of file diff --git a/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js b/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js deleted file mode 100644 index 785a140db4056b1c36e040752a0824d041ea2ccf..0000000000000000000000000000000000000000 --- a/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js +++ /dev/null @@ -1,26 +0,0 @@ -import("system.SQLTYPES"); -import("system.result"); -import("system.vars"); -import("system.translate"); -import("Keyword_lib"); -import("Sql_lib"); -import("KeywordRegistry_basic"); - -var sqlHelper = new SqlMaskingUtils(); - -var sqlQuery = newSelect("OFFERID as \"_uid_\", " - + sqlHelper.concat([sqlHelper.cast("OFFERCODE", SQLTYPES.CHAR, 10), KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.offerStatus(), "OFFER.STATUS")], " | ") - + " as TITLECOLUMN, " - + sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Description") + ":'", sqlHelper.castLob("OFFER.INFO", 250)]) - + " as DESCCOLUMN, OFFERCODE, ORGANISATION.NAME, CUSTOMERCODE") - .from("OFFER") - .join("CONTACT", "OFFER.CONTACT_ID = CONTACTID") - .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID") - .orderBy("OFFERCODE"); - -if (vars.exists("$local.idvalue")) { - var affectedIds = vars.get("$local.idvalue"); - sqlQuery.whereIfSet("OFFER.OFFERID", affectedIds, SqlBuilder.IN()); -} - -result.string(sqlQuery.toString()); \ No newline at end of file diff --git a/aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js deleted file mode 100644 index dcf9a80b48190e9bed315bae39cf84fc1bc113af..0000000000000000000000000000000000000000 --- a/aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js +++ /dev/null @@ -1,48 +0,0 @@ -import("system.db"); -import("system.result"); -import("system.vars"); -import("IndexSearch_lib"); -import("Sql_lib"); - -var infoContainer, onUpdFn, tableName, res; - -tableName = vars.get("$local.table"); -idValue = vars.get("$local.idvalue"); -infoContainer = IndexsearchUtils.createAffectedInfoContainer(idValue, null, vars.get("$local.action") - ,function (){return vars.get("$local.columns")} - ,function (){return vars.get("$local.oldvalues")} - ,function (){return vars.get("$local.values")}); - -switch (tableName) -{ - case "CONTACT": - res = [idValue]; - break; - case "ORGANISATION": - res = newSelect("CONTACT.CONTACTID") - .from("CONTACT") - .where("CONTACT.PERSON_ID is null") - .and("CONTACT.ORGANISATION_ID", idValue) - .arrayColumn(); - break; - case "ADDRESS": - res = IndexsearchUtils.getAffectedIdValues("CONTACT_ID", infoContainer, function (id){ - return newSelect("ADDRESS.CONTACT_ID") - .from("ADDRESS") - .where("ADDRESS.ADDRESSID", id) - .arrayColumn(); - }); - break; - case "COMMUNICATION": - res = IndexsearchUtils.getAffectedIdValues("CONTACT_ID", infoContainer, function (id){ - return newSelect("COMMUNICATION.CONTACT_ID") - .from("COMMUNICATION") - .where("COMMUNICATION.COMMUNICATIONID", id) - .arrayColumn(); - }); - break; -} - -if (res) { - result.object(res); -} \ No newline at end of file diff --git a/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js b/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js deleted file mode 100644 index 87019debfc6fa7b451e6f2140b62f137d4f1b2d9..0000000000000000000000000000000000000000 --- a/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js +++ /dev/null @@ -1,31 +0,0 @@ -import("system.result"); -import("system.vars"); -import("system.translate"); -import("Sql_lib"); -import("Communication_lib"); - -var sqlHelper = new SqlMaskingUtils(); - -var sqlQuery = newSelect("CONTACT.CONTACTID as \"_uid_\"" - + "," + sqlHelper.concat(["ORGANISATION.NAME", "'|'", "ORGANISATION.CUSTOMERCODE"]) - + " as TITLECOLUMN " - + "," + sqlHelper.concat([ - sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'" - ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"]) - ,sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"]) - ,sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"]) - ], " | ") + " as DESCCOLUMN " - //additional indexed fields - + ",ORGANISATION.NAME, COMMUNICATION.ADDR") - .from("ORGANISATION") - .join("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null") - .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress") - .leftJoin("COMMUNICATION", "defaultAddress.ADDRESSID = COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID") - .orderBy("CONTACT.CONTACTID"); - -if (vars.exists("$local.idvalue")) { - var affectedIds = vars.get("$local.idvalue"); - sqlQuery.whereIfSet("CONTACT.CONTACTID", affectedIds, SqlBuilder.IN()); -} - -result.string(sqlQuery.toString()); \ No newline at end of file diff --git a/aliasDefinition/Data_alias/indexsearchgroups/organisation/subQueries.js b/aliasDefinition/Data_alias/indexsearchgroups/organisation/subQueries.js deleted file mode 100644 index 17a37f0ca6aa9488c56d0bd230066e8fd35e77c2..0000000000000000000000000000000000000000 --- a/aliasDefinition/Data_alias/indexsearchgroups/organisation/subQueries.js +++ /dev/null @@ -1,3 +0,0 @@ -import("system.result"); - -result.string("select ADDRESS.ZIP, ADDRESS.CITY, ADDRESS.COUNTRY, ADDRESS.ADDRESS from ADDRESS where ADDRESS.CONTACT_ID = '@@@'"); \ No newline at end of file diff --git a/aliasDefinition/Data_alias/indexsearchgroups/person/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/person/affectedIds.js deleted file mode 100644 index debeb72a7a51961a42cdad671ca878c705aad63f..0000000000000000000000000000000000000000 --- a/aliasDefinition/Data_alias/indexsearchgroups/person/affectedIds.js +++ /dev/null @@ -1,55 +0,0 @@ -import("system.db"); -import("system.result"); -import("system.vars"); -import("IndexSearch_lib"); -import("Sql_lib"); - -var infoContainer, onUpdFn, tableName, res; - -tableName = vars.get("$local.table"); -idValue = vars.get("$local.idvalue"); -infoContainer = IndexsearchUtils.createAffectedInfoContainer(idValue, null, vars.get("$local.action") - ,function (){return vars.get("$local.columns")} - ,function (){return vars.get("$local.oldvalues")} - ,function (){return vars.get("$local.values")}); - -switch (tableName) -{ - case "CONTACT": - res = [idValue]; - break; - case "PERSON": - res = newSelect("CONTACT.CONTACTID") - .from("CONTACT") - .where("CONTACT.PERSON_ID", idValue) - .arrayColumn(); - break; - case "ORGANISATION": - res = newSelect("CONTACT.CONTACTID") - .from("CONTACT") - .where("CONTACT.PERSON_ID is not null") - .and("CONTACT.ORGANISATION_ID", idValue) - .arrayColumn(); - break; - case "ADDRESS": - res = IndexsearchUtils.getAffectedIdValues("CONTACT_ID", infoContainer, function (id){ - return newSelect("ADDRESS.CONTACT_ID") - .from("ADDRESS") - .where("ADDRESS.ADDRESSID", id) - .arrayColumn(); - }); - break; - case "COMMUNICATION": - res = IndexsearchUtils.getAffectedIdValues("CONTACT_ID", infoContainer, function (id){ - return newSelect("COMMUNICATION.CONTACT_ID") - .from("COMMUNICATION") - .where("COMMUNICATION.COMMUNICATIONID", id) - .arrayColumn(); - }); - break; -} - -if (res) { - result.object(res); -} - \ No newline at end of file diff --git a/aliasDefinition/Data_alias/indexsearchgroups/person/query.js b/aliasDefinition/Data_alias/indexsearchgroups/person/query.js deleted file mode 100644 index 19e2424e39fc96aa72cc506005050289b67756c9..0000000000000000000000000000000000000000 --- a/aliasDefinition/Data_alias/indexsearchgroups/person/query.js +++ /dev/null @@ -1,34 +0,0 @@ -import("system.translate"); -import("system.result"); -import("system.vars"); -import("system.calendars"); -import("system.db"); -import("Sql_lib"); -import("Communication_lib"); - -var sqlHelper = new SqlMaskingUtils(); - -var sqlQuery = newSelect("CONTACT.CONTACTID as \"_uid_\"" - + "," + sqlHelper.concat(["PERSON.SALUTATION", "PERSON.FIRSTNAME", "PERSON.LASTNAME", "'|'", "ORGANISATION.NAME"]) - + " as TITLECOLUMN " - + "," + sqlHelper.concat([ - sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'" - ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"]) - ,sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"]) - ,sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"]) - ], " | ") + " as DESCCOLUMN " - //additional indexed fields - + ",ORGANISATION.NAME, COMMUNICATION.ADDR") - .from("PERSON") - .join("CONTACT", "CONTACT.PERSON_ID = PERSON.PERSONID") - .join("ORGANISATION", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID") - .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress") - .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID") - .orderBy("CONTACT.CONTACTID"); - -if (vars.exists("$local.idvalue")) { - var affectedIds = vars.get("$local.idvalue"); - sqlQuery.whereIfSet("CONTACT.CONTACTID", affectedIds, SqlBuilder.IN()); -} - -result.string(sqlQuery.toString()); \ No newline at end of file diff --git a/aliasDefinition/Data_alias/indexsearchgroups/person/subQueries.js b/aliasDefinition/Data_alias/indexsearchgroups/person/subQueries.js deleted file mode 100644 index 17a37f0ca6aa9488c56d0bd230066e8fd35e77c2..0000000000000000000000000000000000000000 --- a/aliasDefinition/Data_alias/indexsearchgroups/person/subQueries.js +++ /dev/null @@ -1,3 +0,0 @@ -import("system.result"); - -result.string("select ADDRESS.ZIP, ADDRESS.CITY, ADDRESS.COUNTRY, ADDRESS.ADDRESS from ADDRESS where ADDRESS.CONTACT_ID = '@@@'"); \ No newline at end of file diff --git a/aliasDefinition/Data_alias/indexsearchgroups/product/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/product/affectedIds.js deleted file mode 100644 index 548f327a66b7b08252086a013c0152cd52f8da20..0000000000000000000000000000000000000000 --- a/aliasDefinition/Data_alias/indexsearchgroups/product/affectedIds.js +++ /dev/null @@ -1,4 +0,0 @@ -import("system.vars"); -import("system.result"); - -result.object([vars.getString("$local.idvalue")]); \ No newline at end of file diff --git a/aliasDefinition/Data_alias/indexsearchgroups/product/query.js b/aliasDefinition/Data_alias/indexsearchgroups/product/query.js deleted file mode 100644 index 5da65de56c933462fc731f4deeeb1dab86efc0be..0000000000000000000000000000000000000000 --- a/aliasDefinition/Data_alias/indexsearchgroups/product/query.js +++ /dev/null @@ -1,23 +0,0 @@ -import("system.result"); -import("system.vars"); -import("system.translate"); -import("Keyword_lib"); -import("Sql_lib"); -import("KeywordRegistry_basic"); - -var sqlHelper = new SqlMaskingUtils(); - -var sqlQuery = newSelect("PRODUCTID as \"_uid_\", " - + sqlHelper.concat(["PRODUCTCODE", "PRODUCTNAME"], " | ") - + " as TITLECOLUMN, " - + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODEID") - + " as DESCCOLUMN, PRODUCTCODE ") - .from("PRODUCT") - .orderBy("PRODUCTCODE"); - -if (vars.exists("$local.idvalue")) { - var affectedIds = vars.get("$local.idvalue"); - sqlQuery.whereIfSet("PRODUCT.PRODUCTID", affectedIds, SqlBuilder.IN()); -} - -result.string(sqlQuery.toString()); \ No newline at end of file diff --git a/aliasDefinition/Data_alias/indexsearchgroups/salesorder/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/salesorder/affectedIds.js deleted file mode 100644 index 548f327a66b7b08252086a013c0152cd52f8da20..0000000000000000000000000000000000000000 --- a/aliasDefinition/Data_alias/indexsearchgroups/salesorder/affectedIds.js +++ /dev/null @@ -1,4 +0,0 @@ -import("system.vars"); -import("system.result"); - -result.object([vars.getString("$local.idvalue")]); \ No newline at end of file diff --git a/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js b/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js deleted file mode 100644 index a49fcf8b7dc24b8867a5f31e4059362d2fa7621e..0000000000000000000000000000000000000000 --- a/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js +++ /dev/null @@ -1,26 +0,0 @@ -import("system.SQLTYPES"); -import("system.result"); -import("system.vars"); -import("system.translate"); -import("Sql_lib"); -import("Keyword_lib"); -import("KeywordRegistry_basic"); - -var sqlHelper = new SqlMaskingUtils(); - -var sqlQuery = newSelect("SALESORDERID as \"_uid_\", " - + sqlHelper.concat([sqlHelper.cast("SALESORDERCODE", SQLTYPES.CHAR, 10), KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesorderState(), "SALESORDER.STATUS")], " | ") - + " as TITLECOLUMN, " - + sqlHelper.concat(["ORGANISATION.NAME"], " | ") - + " as DESCCOLUMN, SALESORDERCODE, ORGANISATION.NAME, CUSTOMERCODE") - .from("SALESORDER") - .join("CONTACT", "SALESORDER.CONTACT_ID = CONTACTID") - .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID") - .orderBy("SALESORDERCODE"); - -if (vars.exists("$local.idvalue")) { - var affectedIds = vars.get("$local.idvalue"); - sqlQuery.whereIfSet("SALESORDER.SALESORDERID", affectedIds, SqlBuilder.IN()); -} - -result.string(sqlQuery.toString()); \ No newline at end of file diff --git a/aliasDefinition/Data_alias/indexsearchgroups/salesproject/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/salesproject/affectedIds.js deleted file mode 100644 index 548f327a66b7b08252086a013c0152cd52f8da20..0000000000000000000000000000000000000000 --- a/aliasDefinition/Data_alias/indexsearchgroups/salesproject/affectedIds.js +++ /dev/null @@ -1,4 +0,0 @@ -import("system.vars"); -import("system.result"); - -result.object([vars.getString("$local.idvalue")]); \ No newline at end of file diff --git a/aliasDefinition/Data_alias/indexsearchgroups/salesproject/query.js b/aliasDefinition/Data_alias/indexsearchgroups/salesproject/query.js deleted file mode 100644 index fafe6470b629a09ebc419d96b293708fa13a9834..0000000000000000000000000000000000000000 --- a/aliasDefinition/Data_alias/indexsearchgroups/salesproject/query.js +++ /dev/null @@ -1,24 +0,0 @@ -import("system.result"); -import("system.vars"); -import("system.translate"); -import("Keyword_lib"); -import("Sql_lib"); -import("KeywordRegistry_basic"); - -var sqlHelper = new SqlMaskingUtils(); - -var sqlQuery = newSelect("SALESPROJECTID as \"_uid_\", PROJECTTITLE as TITLECOLUMN, " - + sqlHelper.concat([ - "'" + translate.text("Status") + ":'", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "STATUS"), - "'| " + translate.text("Phase") + ":'", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "PHASE") - ]) - + " as DESCCOLUMN, PROJECTCODE") - .from("SALESPROJECT") - .orderBy("PROJECTCODE"); - -if (vars.exists("$local.idvalue")) { - var affectedIds = vars.get("$local.idvalue"); - sqlQuery.whereIfSet("SALESPROJECT.SALESPROJECTID", affectedIds, SqlBuilder.IN()); -} - -result.string(sqlQuery.toString()); \ No newline at end of file