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

Refactoring: accidental global variables fixed

parent a967d9cf
No related branches found
No related tags found
No related merge requests found
Showing
with 37 additions and 55 deletions
......@@ -28,7 +28,7 @@ if (!vars.exists("$context.dataCopied") && vars.get("$param.CopyBulkMailId_param
{
var data = entities.getRows(conf)[0];
for (field in data)
for (let field in data)
{
vars.set("$field." + field, data[field]);
}
......
......@@ -97,7 +97,7 @@ function _handleRowIds(pParticipantRowIds, pCampaignId)
let statementArray = [];
let logArray = [];
for (participant in pParticipantRowIds)
for (let participant in pParticipantRowIds)
{
let campaignParticipantLogId = util.getNewUUID();
......
......@@ -6,7 +6,7 @@ let currentEntity = vars.get("$field.ENTITY_TO_SCAN_NAME");
var model = project.getEntityStructure(currentEntity);
let entityFields = [];
for (fieldname in model.fields)
for (let fieldname in model.fields)
{
let field = model.fields[fieldname];
if(field.fieldType == project.ENTITYFIELDTYPE_FIELD)
......
......@@ -6,13 +6,7 @@ import("system.result");
var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
var excludeRolesArray = ["INTERNAL_EVERYONE", "INTERNAL_GROUPWARE", "INTERNAL_SNMP", "INTERNAL_DESIGNER", "INTERNAL_TECHNICAL"];
if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
{
if (userTitle != "") {
var userRoles = tools.getRoles(userTitle);
for (i = 0; i < userRoles.length; i++) {
excludeRolesArray.push(userRoles[i]);
}
}
}
if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW && userTitle)
excludeRolesArray = excludeRolesArray.concat(tools.getRoles(userTitle));
result.string(JSON.stringify(excludeRolesArray));
\ No newline at end of file
......@@ -6,7 +6,7 @@ import("Keyword_lib");
var dupStatus = vars.getString("$field.LEADDUP_STATUS");
var values = KeywordUtils.getEntryNamesAndIdsByContainer($KeywordRegistry.dupStatus());
for (i = 0; i < values.length; i++)
for (let i = 0; i < values.length; i++)
{
if(dupStatus.trim() == values[i][0].trim())
{
......
......@@ -40,10 +40,10 @@ if (binMetadatas.length > 0)
db.deleteData(insertTable, newWhere([insertTable, "ROW_ID"], assignmentRowId).build());//delete existing
for (i = 0; i < table.length; i++)//and load new
for (let i = 0; i < table.length; i++)//and load new
{
insertVals = [];
for (j = 0; j < 30; j++) //fill the 30 data-columns of the table
for (let j = 0; j < 30; j++) //fill the 30 data-columns of the table
{
if(table[i][j] == undefined)
table[i][j] = "";
......
......@@ -9,14 +9,17 @@ var entity = vars.get("$field.ENTITY");
rootPermSet = PermissionUtil.getSetRoot(role, entity);
if (rootPermSet == "") {
if (rootPermSet == "")
{
result.string(neon.COMPONENTSTATE_DISABLED);
} else {
}
else
{
entityStructure = project.getEntityStructure(entity);
for (fieldname in entityStructure.fields) {
for (let fieldname in entityStructure.fields)
{
var field = entityStructure.fields[fieldname];
if (field.usePermissions == true) {
result.string(neon.COMPONENTSTATE_EDITABLE)
}
if (field.usePermissions == true)
result.string(neon.COMPONENTSTATE_EDITABLE);
}
}
\ No newline at end of file
......@@ -22,15 +22,17 @@ var entitiesUsePermFlagSet = [];
var fieldsUsePermFlagSet = [];
// gets all names of entites and fields which have the 'usePermission'-flag set (positive list)
for each (let entityMetaData in entitiesMetaData) {
for (let entityMetaDataId in entitiesMetaData)
{
let entityMetaData = entitiesMetaData[entityMetaDataId];
if (entityMetaData[6] == "true") {
entitiesUsePermFlagSet.push(entityMetaData[0])
entityStructure = project.getEntityStructure(entityMetaData[0]);
for (fieldname in entityStructure.fields) {
for (let fieldname in entityStructure.fields)
{
field = entityStructure.fields[fieldname];
if (field.usePermissions == true) {
if (field.usePermissions == true)
fieldsUsePermFlagSet.push(field.name);
}
}
}
}
......
......@@ -20,19 +20,10 @@ var phases = newSelect("KEYID, AB_KEYWORD_ENTRY.TITLE, count(PHASE), AB_KEYWORD_
.orderBy("SORTING")
.table();
for(i = 0; i < phases.length; i++){
if(phases[i][1] == "${SALESPROJECT_OFFER}"){
for(let i = 0; i < phases.length; i++)
{
if(phases[i][1] == "${SALESPROJECT_OFFER}")
phases[i][1] = "Offer";
}
}
result.object(phases);
result.object(phases);
\ No newline at end of file
......@@ -20,16 +20,8 @@ import("system.util");
import("system.eMath");
import("system.text");
var entry;
var params = {};
var pointOfContact;
var mailAffectedUser = [];
var uidAppointment;
var values;
var columns;
var update;
var i;
var selectionRowData = vars.get("$sys.selectionRows");
......@@ -63,7 +55,7 @@ var contactCommunication = newSelect("COMMUNICATION.MEDIUM_ID, COMMUNICATION.ADD
if(contactCommunication.length > 0)
{
var communicationString;
for (i = 0; i < contactCommunication.length; i++)
for (let i = 0; i < contactCommunication.length; i++)
{
communicationString += KeywordUtils.getViewValue($KeywordRegistry.communicationMedium(), contactCommunication[i][0]) + ": "
+ contactCommunication[i][1] + "</br>"
......@@ -88,34 +80,34 @@ startdate = datetime.toLong(startdate, "dd-MM-yyyy HH:mm:ss.S");
var duration = eMath.subInt(endTime, startTime);
entry = CalendarUtil.createEntry("", calendars.VEVENT, summary, description, false, false, false,
var entry = CalendarUtil.createEntry("", calendars.VEVENT, summary, description, false, false, false,
vars.get("$sys.user"), [vars.get("$sys.user")], startdate, duration, null, calendars.STATUS_TENTATIVE, null, null);
params["Entry_param"] = JSON.stringify(entry);
uidAppointment = calendars.insert([entry]);
var uidAppointment = calendars.insert([entry]);
columns = ["AB_APPOINTMENTLINK_ID",
var columns = ["AB_APPOINTMENTLINK_ID",
"APPOINTMENT_ID",
"OBJECT_TYPE",
"OBJECT_ROWID"]
values = [util.getNewUUID(),
var values = [util.getNewUUID(),
uidAppointment[0],
"Organisation",
organisationContact_id]
insert = db.insertData("AB_APPOINTMENTLINK", columns, null, values)
db.insertData("AB_APPOINTMENTLINK", columns, null, values)
values = [util.getNewUUID(),
uidAppointment[0],
"Person",
contact_id]
insert = db.insertData("AB_APPOINTMENTLINK", columns, null, values)
db.insertData("AB_APPOINTMENTLINK", columns, null, values)
values = [$KeywordRegistry.visitPlanEntryStatus$Appointmentarranged(), uidAppointment[0]];
columns = ["STATUS", "APPOINTMENT_ID"];
update = newWhere("VISITPLANENTRY.VISITPLANENTRYID", uid)
.updateData(true, "VISITPLANENTRY", columns, null, values);
newWhere("VISITPLANENTRY.VISITPLANENTRYID", uid)
.updateData(true, "VISITPLANENTRY", columns, null, values);
neon.setFieldValue("$field.STATUS", $KeywordRegistry.visitPlanEntryStatus$Appointmentarranged());
neon.refreshAll();
\ 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