diff --git a/entity/Address_entity/conditionProcess.js b/entity/Address_entity/conditionProcess.js index 08c672c31be0767f42ccbf85b5de0a459d9e0c74..7ee6a70eb73ceb8666f4e765a793f3cd5ad8ab65 100644 --- a/entity/Address_entity/conditionProcess.js +++ b/entity/Address_entity/conditionProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.result"); import("system.vars"); diff --git a/entity/Address_entity/entityfields/date_new/valueProcess.js b/entity/Address_entity/entityfields/date_new/valueProcess.js index eedddb3cf02507bf4da985cf9db27f79c8468b55..abfd322661115639b35d528163d98e4112b15eaa 100644 --- a/entity/Address_entity/entityfields/date_new/valueProcess.js +++ b/entity/Address_entity/entityfields/date_new/valueProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.result"); import("system.neon"); diff --git a/entity/Address_entity/entityfields/is_standard/onValueChange.js b/entity/Address_entity/entityfields/is_standard/onValueChange.js index c4170ac0088bf8f2be38ca4e2370afe23318e9f9..3c35de46027621e021eb61c8ef4552e908850bd5 100644 --- a/entity/Address_entity/entityfields/is_standard/onValueChange.js +++ b/entity/Address_entity/entityfields/is_standard/onValueChange.js @@ -1,5 +1,4 @@ import("system.neon"); -import("system.logging"); import("system.vars"); vars.set("$image.EditedStandardAddressId", vars.get("$field.ADDRESSID")); diff --git a/entity/Address_entity/entityfields/is_standard/valueProcess.js b/entity/Address_entity/entityfields/is_standard/valueProcess.js index 793e8ffb4806ecdafc6b81fbd37826483c175a65..3c3879da2a896b3db990f40001ed04e2f2e1f4c5 100644 --- a/entity/Address_entity/entityfields/is_standard/valueProcess.js +++ b/entity/Address_entity/entityfields/is_standard/valueProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.result"); diff --git a/entity/Address_entity/entityfields/relation_id/valueProcess.js b/entity/Address_entity/entityfields/relation_id/valueProcess.js index b4b2e6cbf5f7886deee51e06ee42966dad0f90b9..2d085e3aff5efa91eca352d8fc20a4c2c7bbdd4a 100644 --- a/entity/Address_entity/entityfields/relation_id/valueProcess.js +++ b/entity/Address_entity/entityfields/relation_id/valueProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.result"); import("system.neon"); import("system.vars"); diff --git a/entity/Address_entity/entityfields/user_new/valueProcess.js b/entity/Address_entity/entityfields/user_new/valueProcess.js index f9abb66712ca12b68fe96e5a37b1bb123c484bc7..81966a3fbcd9b3cf25a186c93baa1928abc9d6d2 100644 --- a/entity/Address_entity/entityfields/user_new/valueProcess.js +++ b/entity/Address_entity/entityfields/user_new/valueProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.result"); import("system.neon"); diff --git a/entity/Appointment_entity/entityfields/status/possibleItemsProcess.js b/entity/Appointment_entity/entityfields/status/possibleItemsProcess.js index cb33320206448252facfd658ebb4bf79cc8ad9b6..af4adc546276386b72eae1b8e7f0a6fa21adc0c5 100644 --- a/entity/Appointment_entity/entityfields/status/possibleItemsProcess.js +++ b/entity/Appointment_entity/entityfields/status/possibleItemsProcess.js @@ -1,22 +1,21 @@ -import("system.logging"); -import("system.result"); -import("system.translate"); -import("system.calendars"); - -if( calendars.getBackendType() != calendars.BACKEND_EXCHANGEWS ) -{ - result.object([ - [calendars.STATUS_CONFIRMED, translate.text("Bestätigt")], - [calendars.STATUS_TENTATIVE, translate.text("Vorläufig")], - [calendars.STATUS_CANCELLED, translate.text("Abgesagt")] - ]); -} -else -{ - result.object( [ - [calendars.STATUS_BUSY, translate.text("Gebucht")], - [calendars.STATUS_TENTATIVE, translate.text("Vorläufig")], - [calendars.STATUS_OOF, translate.text("Außer Haus")], - [calendars.STATUS_FREE, translate.text("frei")] - ] ); +import("system.result"); +import("system.translate"); +import("system.calendars"); + +if( calendars.getBackendType() != calendars.BACKEND_EXCHANGEWS ) +{ + result.object([ + [calendars.STATUS_CONFIRMED, translate.text("Bestätigt")], + [calendars.STATUS_TENTATIVE, translate.text("Vorläufig")], + [calendars.STATUS_CANCELLED, translate.text("Abgesagt")] + ]); +} +else +{ + result.object( [ + [calendars.STATUS_BUSY, translate.text("Gebucht")], + [calendars.STATUS_TENTATIVE, translate.text("Vorläufig")], + [calendars.STATUS_OOF, translate.text("Außer Haus")], + [calendars.STATUS_FREE, translate.text("frei")] + ] ); } \ No newline at end of file diff --git a/entity/Appointment_entity/onInsert.js b/entity/Appointment_entity/onInsert.js index aab9e275f5eb7db2481219fff63ef537b27fd17e..9bbaf367e6deb25aa244d9a5cd8f330a94e75501 100644 --- a/entity/Appointment_entity/onInsert.js +++ b/entity/Appointment_entity/onInsert.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.neon"); import("system.calendars"); import("system.vars"); diff --git a/entity/Appointment_entity/onUpdate.js b/entity/Appointment_entity/onUpdate.js index 8761d4bf40789fce2293b40149d4b39916b4d2ca..f847e096577dfb0c7b24d4d5e884fd83acc96099 100644 --- a/entity/Appointment_entity/onUpdate.js +++ b/entity/Appointment_entity/onUpdate.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.neon"); import("system.calendars"); import("system.vars"); diff --git a/entity/Comm_entity/entityfields/addr/onValidation.js b/entity/Comm_entity/entityfields/addr/onValidation.js index 636a54f8673cf81aa40e116ba4a96ab9b95aa31d..46ef615162332b5c2065c87b20629319e8f4cb65 100644 --- a/entity/Comm_entity/entityfields/addr/onValidation.js +++ b/entity/Comm_entity/entityfields/addr/onValidation.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.translate"); import("system.vars"); import("system.net"); diff --git a/entity/Comm_entity/entityfields/date_new/valueProcess.js b/entity/Comm_entity/entityfields/date_new/valueProcess.js index eedddb3cf02507bf4da985cf9db27f79c8468b55..abfd322661115639b35d528163d98e4112b15eaa 100644 --- a/entity/Comm_entity/entityfields/date_new/valueProcess.js +++ b/entity/Comm_entity/entityfields/date_new/valueProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.result"); import("system.neon"); diff --git a/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js b/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js index 4f577af9f6207473a6314a855c0814740c75a3e5..abec3313396ba6c58cf4dc31f4b2d97c0c033bb2 100644 --- a/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js +++ b/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.text"); import("system.vars"); import("system.result"); diff --git a/entity/Comm_entity/entityfields/user_new/valueProcess.js b/entity/Comm_entity/entityfields/user_new/valueProcess.js index f9abb66712ca12b68fe96e5a37b1bb123c484bc7..81966a3fbcd9b3cf25a186c93baa1928abc9d6d2 100644 --- a/entity/Comm_entity/entityfields/user_new/valueProcess.js +++ b/entity/Comm_entity/entityfields/user_new/valueProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.result"); import("system.neon"); diff --git a/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js b/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js index 2b4986de6169ea5ce6d3df595321688b516e07aa..fd07f7811a3ac94b77cfbb5f8946e96a92f93d42 100644 --- a/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js +++ b/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.result"); import("system.neon"); diff --git a/entity/Document_entity/entityfields/bindata_upload/onValueChange.js b/entity/Document_entity/entityfields/bindata_upload/onValueChange.js index 6f86a73853448afd96303a0626d23f008ef62d2c..bac80becd0f9e237b82c178ca5eaa60957a29662 100644 --- a/entity/Document_entity/entityfields/bindata_upload/onValueChange.js +++ b/entity/Document_entity/entityfields/bindata_upload/onValueChange.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.neon"); import("Entity_lib"); diff --git a/entity/Document_entity/onInsert.js b/entity/Document_entity/onInsert.js index 5bb825c7b8412a332957bbd3d90b01cca81e79fa..89af5c1e5147acc5ee5656a79d981614b015a13d 100644 --- a/entity/Document_entity/onInsert.js +++ b/entity/Document_entity/onInsert.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.db"); import("system.vars"); import("Document_lib"); diff --git a/entity/Document_entity/onUpdate.js b/entity/Document_entity/onUpdate.js index b43e4f3eaebf22042cbcdefaa67a199a2e849a01..a75b4ed4291010a124b9325f880b3e619529a1db 100644 --- a/entity/Document_entity/onUpdate.js +++ b/entity/Document_entity/onUpdate.js @@ -1,6 +1,5 @@ import("system.vars"); import("system.db"); -import("system.logging"); import("Document_lib"); var id = vars.get("$field.ID"); diff --git a/entity/History_entity/onDBDelete.js b/entity/History_entity/onDBDelete.js index 2949aff8f675303a0ee647b6e044a9030c1c5e58..c054511acc1b09e43342928834e640c67a375d3f 100644 --- a/entity/History_entity/onDBDelete.js +++ b/entity/History_entity/onDBDelete.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.db"); diff --git a/entity/Offer_entity/entityfields/newoffer/onActionProcess.js b/entity/Offer_entity/entityfields/newoffer/onActionProcess.js index 46d81aed97b3bd2e86b855020476b9a11e0618b1..be634293e5dadcd9d97b5c643c1a73618ea635c8 100644 --- a/entity/Offer_entity/entityfields/newoffer/onActionProcess.js +++ b/entity/Offer_entity/entityfields/newoffer/onActionProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.neon"); import("Util_lib"); diff --git a/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js b/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js index 7482f38129f497c9040811e120752578a9498a44..8b605bf652b2f7c035c8a3a50fa3b32a5b24a68a 100644 --- a/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js +++ b/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.neon"); import("Util_lib"); diff --git a/entity/Offeritem_entity/conditionProcess.js b/entity/Offeritem_entity/conditionProcess.js index b39721ef89a7459add6bade8992f1d23296a84c4..810d73b91164b9eee3e9ec78ae7734dfd422b001 100644 --- a/entity/Offeritem_entity/conditionProcess.js +++ b/entity/Offeritem_entity/conditionProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.result"); import("system.vars"); diff --git a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js index 252419a862f0599a975424643fd12bd2a60f1958..7efabfffbaa58261ae6ad97fbdd370b48a0c3d6e 100644 --- a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js +++ b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.neon"); import("Product_lib"); diff --git a/entity/Offeritem_entity/entityfields/product_id/possibleItemsProcess.js b/entity/Offeritem_entity/entityfields/product_id/possibleItemsProcess.js index f9ee3edbce8cc8b3c6e8e7c65b6f7f3e59087e3f..e19938f82d7f21dbf4c8d427e08312291222547b 100644 --- a/entity/Offeritem_entity/entityfields/product_id/possibleItemsProcess.js +++ b/entity/Offeritem_entity/entityfields/product_id/possibleItemsProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.result"); import("system.db"); import("Sql_lib"); diff --git a/entity/Offeritem_entity/entityfields/quantity/onValueChange.js b/entity/Offeritem_entity/entityfields/quantity/onValueChange.js index aedc968cc70beb0c78061c5d2848f9fcc89caed3..1bd2ecab5dd8e88a6d01291c58303b33bd5e618a 100644 --- a/entity/Offeritem_entity/entityfields/quantity/onValueChange.js +++ b/entity/Offeritem_entity/entityfields/quantity/onValueChange.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.neon"); import("Product_lib"); diff --git a/entity/Offeritem_entity/onDBUpdate.js b/entity/Offeritem_entity/onDBUpdate.js index 2634bf71937e1fd62009316a61e3cf7be2b2c986..b08fccbcce912e64fde7636f3eb9f0b6249a3134 100644 --- a/entity/Offeritem_entity/onDBUpdate.js +++ b/entity/Offeritem_entity/onDBUpdate.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.db"); import("system.neon"); diff --git a/entity/Org_entity/entityfields/org_date_new/valueProcess.js b/entity/Org_entity/entityfields/org_date_new/valueProcess.js index eedddb3cf02507bf4da985cf9db27f79c8468b55..abfd322661115639b35d528163d98e4112b15eaa 100644 --- a/entity/Org_entity/entityfields/org_date_new/valueProcess.js +++ b/entity/Org_entity/entityfields/org_date_new/valueProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.result"); import("system.neon"); diff --git a/entity/Pers_entity/entityfields/org_id/valueProcess.js b/entity/Pers_entity/entityfields/org_id/valueProcess.js index 2c20db8f32f8bdfebf7e493efb47f02438b5e403..0e785910ddae76b23d5b3de4e5a3fab3afa8eedd 100644 --- a/entity/Pers_entity/entityfields/org_id/valueProcess.js +++ b/entity/Pers_entity/entityfields/org_id/valueProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.result"); import("system.neon"); diff --git a/entity/Pers_entity/entityfields/orgname/linkedContextProcess.js b/entity/Pers_entity/entityfields/orgname/linkedContextProcess.js index d2f6c19c344fc058cc0085f00f015667ee3acc2d..b2ea995a1258e6319bc18b1411be8a6dd7c3125f 100644 --- a/entity/Pers_entity/entityfields/orgname/linkedContextProcess.js +++ b/entity/Pers_entity/entityfields/orgname/linkedContextProcess.js @@ -1,14 +1,13 @@ -import("system.logging"); -import("system.vars"); -import("system.result"); -import("system.neon"); - -var orgid = vars.getString("$field.ORGID"); - -if(vars.exists("$image.lookup_orgname") && vars.get("$image.lookup_orgname") != '') - result.string("Org_context"); -else if((orgid == null || orgid.trim() == "0") - && (vars.get("$sys.operatingstate") != neon.OPERATINGSTATE_NEW)) - result.string(null); -else - result.string("Org_context"); +import("system.vars"); +import("system.result"); +import("system.neon"); + +var orgid = vars.getString("$field.ORGID"); + +if(vars.exists("$image.lookup_orgname") && vars.get("$image.lookup_orgname") != '') + result.string("Org_context"); +else if((orgid == null || orgid.trim() == "0") + && (vars.get("$sys.operatingstate") != neon.OPERATINGSTATE_NEW)) + result.string(null); +else + result.string("Org_context"); diff --git a/entity/Pers_entity/entityfields/perspricelist_dfo/stateProcess.js b/entity/Pers_entity/entityfields/perspricelist_dfo/stateProcess.js index 41f9da82fe6225865cafe66e1568f7d9421d4b9c..ae86a254b64040d0feb02e022eb7c4974176b4e7 100644 --- a/entity/Pers_entity/entityfields/perspricelist_dfo/stateProcess.js +++ b/entity/Pers_entity/entityfields/perspricelist_dfo/stateProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.result"); diff --git a/entity/Prod2prod_entity/entityfields/source_id/possibleItemsProcess.js b/entity/Prod2prod_entity/entityfields/source_id/possibleItemsProcess.js index ce35858aa77887bb80937edf71cf01f70872c009..19904fc3d9a28d79aa5ebd43efbc5e12005df4db 100644 --- a/entity/Prod2prod_entity/entityfields/source_id/possibleItemsProcess.js +++ b/entity/Prod2prod_entity/entityfields/source_id/possibleItemsProcess.js @@ -2,7 +2,6 @@ import("system.vars"); import("system.result"); import("system.db"); import("system.neon"); -import("system.logging"); import("Keyword_lib"); import("Product_lib"); @@ -12,11 +11,7 @@ if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys var prodid = vars.get("$field.DEST_ID"); var excludeableProds = [prodid]; - var p2pUtils = new Prod2ProdUtils(prodid); - - logging.log("partslist:" + p2pUtils.getPartsListProdIds()); - logging.log("parentlist:" + p2pUtils.getParentProdIds()); - + var p2pUtils = new Prod2ProdUtils(prodid); excludeableProds = excludeableProds.concat(p2pUtils.getPartsListProdIds()); excludeableProds = excludeableProds.concat(p2pUtils.getParentProdIds()); diff --git a/entity/Product_entity/entityfields/org_id/valueProcess.js b/entity/Product_entity/entityfields/org_id/valueProcess.js index d1edd60f9f80c94fbee87b6e59218b74ab78169e..de32e15c56f4743946b19f2cd9b7383df46b1c37 100644 --- a/entity/Product_entity/entityfields/org_id/valueProcess.js +++ b/entity/Product_entity/entityfields/org_id/valueProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.result"); import("system.neon"); diff --git a/entity/Productprice_entity/conditionProcess.js b/entity/Productprice_entity/conditionProcess.js index c09f20de054b7d605cd8eebe42b056124cb76a9b..440dbdb5cb6f0ee33cef992ffd90e9eec0345992 100644 --- a/entity/Productprice_entity/conditionProcess.js +++ b/entity/Productprice_entity/conditionProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.result"); import("system.vars"); diff --git a/entity/Stock_entity/conditionProcess.js b/entity/Stock_entity/conditionProcess.js index 8f62c84c72d9a943b4126f099d63198be98d4d7f..530b6b4554efcdcae9c8e4568efb959b58b86c5a 100644 --- a/entity/Stock_entity/conditionProcess.js +++ b/entity/Stock_entity/conditionProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.result"); import("system.vars"); diff --git a/entity/Stock_entity/entityfields/stockcount/valueProcess.js b/entity/Stock_entity/entityfields/stockcount/valueProcess.js index 4c32e2524eda69478457c1979858e40229135cba..ca5d66d899268063aa3db0e455f9679d153183d8 100644 --- a/entity/Stock_entity/entityfields/stockcount/valueProcess.js +++ b/entity/Stock_entity/entityfields/stockcount/valueProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.result"); import("system.vars"); import("Product_lib"); diff --git a/process/Appointment_lib/process.js b/process/Appointment_lib/process.js index 476a993b04c8dc887aee6b8479fb1ff8fd49b519..ee83066b4c77e0379ab60c6a1fccd78bc9b40646 100644 --- a/process/Appointment_lib/process.js +++ b/process/Appointment_lib/process.js @@ -1,71 +1,70 @@ -import("system.neon"); -import("system.logging"); -import("system.text"); - -function AppointmentUtils() -{ - - /** - * Sets the partstat of the current users as given param state - * currentUserUri: string currentUserUri - * attendees: MSencoded calendarusers - * state: sets partstat - */ - this.setPartStat = function (currentUserUri, attendees, newState) - { - attendeesDecodedArray = text.decodeMS(attendees); - - for(var i = 0; i < attendeesDecodedArray.length; i++) - { - var decoded = text.decodeMS(attendeesDecodedArray[i]) - if(decoded[0] == currentUserUri) - { - var updated = new Array(); - - var isSet = false; - for (var j = 0; j < decoded.length; j++) - { - if (decoded[j].substr(0, 9) == "PARTSTAT:") - { - updated.push("PARTSTAT:" + newState); - isSet = true; - } - else - { - updated.push(decoded[j]) - } - } - - if (!isSet) - { - updated.push("PARTSTAT:" + newState); - } - - // Updaten Attendees - var newAttendees = new Array(); - for (var x = 0; x < attendeesDecodedArray.length; x++) - { - if (text.decodeMS(attendeesDecodedArray[x])[0] == currentUserUri) - { - newAttendees.push(text.encodeMS( updated)) - } - else - { - newAttendees.push(attendeesDecodedArray[x]) - } - } - break; - } - } - - return text.encodeMS(newAttendees); - } - - - this.sendExchangedAction = function(event, newState) - { - event["X-ADITO-STATUSACTION"] = newState; // "ACCEPT", "DECLINE", "" - event[calendars.AFFECTEDUSERS] = ""; - calendars.updateEntry(event); - } +import("system.neon"); +import("system.text"); + +function AppointmentUtils() +{ + + /** + * Sets the partstat of the current users as given param state + * currentUserUri: string currentUserUri + * attendees: MSencoded calendarusers + * state: sets partstat + */ + this.setPartStat = function (currentUserUri, attendees, newState) + { + attendeesDecodedArray = text.decodeMS(attendees); + + for(var i = 0; i < attendeesDecodedArray.length; i++) + { + var decoded = text.decodeMS(attendeesDecodedArray[i]) + if(decoded[0] == currentUserUri) + { + var updated = new Array(); + + var isSet = false; + for (var j = 0; j < decoded.length; j++) + { + if (decoded[j].substr(0, 9) == "PARTSTAT:") + { + updated.push("PARTSTAT:" + newState); + isSet = true; + } + else + { + updated.push(decoded[j]) + } + } + + if (!isSet) + { + updated.push("PARTSTAT:" + newState); + } + + // Updaten Attendees + var newAttendees = new Array(); + for (var x = 0; x < attendeesDecodedArray.length; x++) + { + if (text.decodeMS(attendeesDecodedArray[x])[0] == currentUserUri) + { + newAttendees.push(text.encodeMS( updated)) + } + else + { + newAttendees.push(attendeesDecodedArray[x]) + } + } + break; + } + } + + return text.encodeMS(newAttendees); + } + + + this.sendExchangedAction = function(event, newState) + { + event["X-ADITO-STATUSACTION"] = newState; // "ACCEPT", "DECLINE", "" + event[calendars.AFFECTEDUSERS] = ""; + calendars.updateEntry(event); + } } \ No newline at end of file diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js index 94451a5e126ea8427c36a2cdf0a633d5633e6bd8..fd59d1bfe5720e27526084973df94bb94b785c75 100644 --- a/process/Product_lib/process.js +++ b/process/Product_lib/process.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.SQLTYPES"); import("system.datetime"); import("system.db"); diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js index f928b3fdb0eaddf135719a91b8228b4fc002acaf..c58c9ba1b7540e6d83d9df85168576251d6a696f 100644 --- a/process/Sql_lib/process.js +++ b/process/Sql_lib/process.js @@ -165,7 +165,7 @@ SqlCondition.prototype.toWhereString = function(alternativeCond){ * @return {Array[][][]} Prepared condition with [condition, [[field1, type1], [field2, type2]]] */ SqlCondition.prototype.build = function(alternativeCond){ - return [cond.toString(alternativeCond), cond.preparedValues]; + return [this.toString(alternativeCond), this.preparedValues]; } /** @@ -177,7 +177,7 @@ SqlCondition.prototype.build = function(alternativeCond){ */ SqlCondition.prototype.buildSelect = function(beforeCondition, alternativeCond, afterCondition) { if (afterCondition == undefined) { afterCondition = "" }; - return [beforeCondition + " " + cond.toWhereString(alternativeCond) + " " + afterCondition, cond.preparedValues]; + return [beforeCondition + " " + this.toWhereString(alternativeCond) + " " + afterCondition, this.preparedValues]; } /**