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

refactorings & todo refactorings

parent 1ff2e143
No related branches found
No related tags found
No related merge requests found
Showing
with 33 additions and 22 deletions
......@@ -6,5 +6,5 @@ var cond = SqlCondition.begin()
.andPrepareVars("ACTIVITYLINK.OBJECT_ROWID", "$param.ObjectRowid_param")
.andPrepareVars("ACTIVITYLINK.OBJECT_TYPE", "$param.ObjectType_param");
//TODO: use a preparedCondition when available
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
......@@ -16,6 +16,6 @@ if(vars.exists("$param.OnlyInnate_param") && vars.get("$param.OnlyInnate_param")
cond.andPrepare("ACTIVITY.CREATOR", vars.get("$sys.user"));
}
//TODO: use a preparedCondition when available
//TODO: use a preparedCondition when available #1030812 #1034026
var resCond = db.translateCondition(cond.build("1 = 1"));
result.string(resCond);
......@@ -4,7 +4,7 @@ import("system.translate");
import("system.result");
import("Sql_lib");
//TODO: temporary testing code
//TODO: temporary testing code -> will be replaced with title-mechanic
var isoCode = vars.get("$field.COUNTRY");
var countryName = db.cell(SqlCondition.begin().andPrepare("AB_COUNTRYINFO.ISO2", isoCode).buildSql("select AB_COUNTRYINFO.NAME_LATIN from AB_COUNTRYINFO"));
countryName = translate.text(countryName);
......
......@@ -10,6 +10,6 @@ var zipCode = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.ZIP"));
var message = "";
var isValid = AddressValidationUtils.isValidZip(countryCode, zipCode);
if (!isValid)
message = translate.text("ZIP code is not valid");//TODO: better message text
message = translate.text("The ZIP code does not match the format of the country.");
result.string(message);
\ No newline at end of file
......@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = SqlCondition.begin()
.andPrepareVars("APPOINTMENTLINK.APPOINTMENT_ID", "$param.AppointmentId_param")
//TODO: use a preparedCondition when available
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
......@@ -12,7 +12,7 @@
<entityField>
<name>OBJECT_TYPE</name>
<title>Context</title>
<possibleItemsProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/object_type/possibleItemsProcess.js</possibleItemsProcess>
<consumer>Contexts</consumer>
</entityField>
<entityField>
<name>AB_ATTRIBUTEUSAGEID</name>
......@@ -55,6 +55,15 @@
<searchable v="false" />
<onValidation>%aditoprj%/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js</onValidation>
</entityField>
<entityConsumer>
<name>Contexts</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Context_entity</entityName>
<fieldName>Context</fieldName>
</dependency>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
import("system.result");
//TODO: when available, use a function to get the possible contexts
result.object([["Organisation_context", "Org"]]);
\ No newline at end of file
......@@ -49,6 +49,12 @@
<fieldName>Contexts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>628bd4db-3b31-4337-88ac-1c000307836f</name>
<entityName>AttributeUsage_entity</entityName>
<fieldName>Contexts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
......
......@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = SqlCondition.begin().andPrepareVars("CONTRACT.CONTACT_ID", "$param.RelId_param");
//TODO: use a preparedCondition when available
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
......@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("OFFER.SALESPROJECT_ID", "$param.SalesprojectId_param");
//TODO: use a preparedCondition when available
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
......@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("OFFER.SALESPROJECT_ID", "$param.SalesprojectId_param");
//TODO: use a preparedCondition when available
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
......@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("SALESORDER.SALESPROJECT_ID", "$param.SalesprojectId_param");
//TODO: use a preparedCondition when available
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
......@@ -4,7 +4,7 @@ import("system.db");
import("system.result");
import("Sql_lib");
//TODO: use a preparedCondition when available
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(
SqlCondition.begin()
.andPrepareVars("ORGANISATION.ORGANISATIONID", "$param.ContactId_param")
......
......@@ -7,5 +7,5 @@ cond.andPrepareVars("CONTACT.ORGANISATION_ID", "$param.OrgId_param");
cond.andPrepareVars("PERSON.CONTACT_ID", "$param.ContactId_param");
//TODO; add OBJECT_ID (probably another param)
//TODO: use a preparedCondition when available
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
......@@ -6,5 +6,5 @@ var cond = new SqlCondition();
cond.andPrepareVars("CONTACT.ORGANISATION_ID", "$param.OrgId_param");
cond.andPrepareVars("PERSON.CONTACT_ID", "$param.ContactId_param");
//TODO: use a preparedCondition when available
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
......@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("SALESPROJECT_COMPETITION.SALESPROJECT_ID", "$param.SalesprojectId_param");
//TODO: use a preparedCondition when available
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
......@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("SALESPROJECT_COMPETITION.SALESPROJECT_ID", "$param.SalesprojectId_param");
//TODO: use a preparedCondition when available
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
......@@ -6,5 +6,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("SALESPROJECT_CYCLE.SALESPROJECT_ID", "$param.SalesprojectId_param");
//TODO: use a preparedCondition when available
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
......@@ -6,5 +6,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("SALESPROJECT_CYCLE.SALESPROJECT_ID", "$param.SalesprojectId_param");
//TODO: use a preparedCondition when available
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
......@@ -5,5 +5,5 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("SALESPROJECT_FORECAST.SALESPROJECT_ID", "$param.SalesprojectId_param");
//TODO: use a preparedCondition when available
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment