Skip to content
Snippets Groups Projects
Commit 8795c239 authored by Maximilian Schröger's avatar Maximilian Schröger
Browse files

Merge branch 'master' of gitlab.adito.de:xrm/basic

parents 4e6e4018 93c1e256
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 875 additions and 859 deletions
entity/Appointment_entity/contentProcess.js
+ 58
− 58
View file @ 8795c239
import("system.logging"); import("system.logging");
import("system.result"); import("system.result");
import("system.vars"); import("system.vars");
import("system.calendars"); import("system.calendars");
import("system.datetime"); import("system.datetime");
import("system.eMath"); import("system.eMath");
import("system.util"); import("system.util");
if(vars.exists("$image.entry")) if(vars.exists("$param.entry"))
{ {
var entry = vars.get("$image.entry"); var entry = JSON.parse(vars.getString("$param.entry"));
var uid = entry[calendars.ID]; var uid = entry[calendars.ID];
var summary = entry[calendars.SUMMARY]; var summary = entry[calendars.SUMMARY];
var attendees = entry[calendars.AFFECTEDUSERS]; var attendees = entry[calendars.AFFECTEDUSERS];
var startdate = entry[calendars.DTSTART]; var startdate = entry[calendars.DTSTART];
var enddate = entry[calendars.DTEND]; var enddate = entry[calendars.DTEND];
var links = entry[calendars.LINKS]; var links = entry[calendars.LINKS];
var description = entry[calendars.DESCRIPTION]; var description = entry[calendars.DESCRIPTION];
var organizer = entry[calendars.ORGANIZER2]; var organizer = entry[calendars.ORGANIZER2];
var status = entry[calendars.STATUS]; var status = entry[calendars.STATUS];
var location = entry[calendars.LOCATION]; var location = entry[calendars.LOCATION];
var reminder = entry[calendars.REMINDER]; var reminder = entry[calendars.REMINDER];
var remindercheck = entry[calendars.HASREMINDER] var remindercheck = entry[calendars.HASREMINDER]
var classification = entry[calendars.CLASSIFICATION]; var classification = entry[calendars.CLASSIFICATION];
var allday = entry[calendars]; var allday = entry[calendars];
//@TODO Icon //@TODO Icon
result.object([ result.object([
[uid, '', '', attendees.length, startdate, enddate, summary, organizer, attendees, status, links, description, location, '', classification, allday] //, location, reminder, remindercheck [uid, '', '', attendees.length, startdate, enddate, summary, organizer, attendees, status, links, description, location, '', classification, allday] //, location, reminder, remindercheck
]); ]);
} }
else else
{ {
var filter = ( vars.exists("$param.p_filter") var filter = ( vars.exists("$param.p_filter")
&& vars.get("$param.p_filter") != null && vars.get("$param.p_filter") != null
&& vars.get("$param.p_filter") != undefined) ? vars.get("$param.p_filter") : ""; && vars.get("$param.p_filter") != undefined) ? vars.get("$param.p_filter") : "";
//For the Tableview in Task_Date //For the Tableview in Task_Date
//var events = getEvents(filter); //var events = getEvents(filter);
var cond = { var cond = {
TYPE_1: calendars.VEVENT TYPE_1: calendars.VEVENT
,USER_1: vars.get("$sys.user") ,USER_1: vars.get("$sys.user")
,COUNT: "1" ,COUNT: "1"
}; };
//var entries = calendars.getExpandedEntries(cond, new Long(datetime.date()), new Long(eMath.addInt(datetime.date(), datetime.ONE_DAY * 7))); //var entries = calendars.getExpandedEntries(cond, new Long(datetime.date()), new Long(eMath.addInt(datetime.date(), datetime.ONE_DAY * 7)));
//for (i = 0; i < events.length; i++) //for (i = 0; i < events.length; i++)
//{ //{
// events[i].push([""]) // events[i].push([""])
// var count = events[i][3]; // var count = events[i][3];
// var iconInfo = (count > 1 ? "gruppentermin" : "einzeltermin"); // var iconInfo = (count > 1 ? "gruppentermin" : "einzeltermin");
// var icon = (getIcon("termine_aufgaben", iconInfo)); // var icon = (getIcon("termine_aufgaben", iconInfo));
// events[i] = events[i].concat(icon); // events[i] = events[i].concat(icon);
//} //}
//result.object(events); //result.object(events);
} }
entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js
+ 17
− 17
View file @ 8795c239
import("system.vars"); import("system.vars");
import("system.logging"); import("system.logging");
import("system.result"); import("system.result");
import("system.calendars"); import("system.calendars");
logging.log("attendees poss-items") logging.log("attendees poss-items")
var entry = vars.get("$image.entry"); var entry = JSON.parse(vars.getString("param.entry"));
var allUsers = calendars.getFullCalendarUsers(calendars.RIGHT_WRITE); var allUsers = calendars.getFullCalendarUsers(calendars.RIGHT_WRITE);
var results = []; var results = [];
for (var i = 0; i < allUsers.length; i++) for (var i = 0; i < allUsers.length; i++)
{ {
results[i] = [allUsers[i][0], allUsers[i][2].paramvalue]; results[i] = [allUsers[i][0], allUsers[i][2].paramvalue];
} }
logging.log(results); logging.log(results);
result.object(results); result.object(results);
\ No newline at end of file
entity/Appointment_entity/entityfields/categories/valueProcess.js
+ 7
− 6
View file @ 8795c239
import("system.result"); import("system.logging");
import("system.vars"); import("system.result");
import("system.calendars"); import("system.vars");
import("system.calendars");
var categs = vars.get("$image.entry")[calendars.CATEGORIES];
result.string(categs); var categs = JSON.parse(vars.getString("param.entry"))[calendars.CATEGORIES];
\ No newline at end of file result.string(categs);
entity/Appointment_entity/onDelete.js
+ 16
− 16
View file @ 8795c239
import("system.neon"); import("system.neon");
import("system.calendars"); import("system.calendars");
import("system.vars"); import("system.vars");
if (vars.exists("$image.entry")) if (vars.exists("param.entry"))
{ {
var entry = vars.get("$image.entry"); var entry = JSON.parse(vars.getString("param.entry"));
var reccurenceid = entry[calendars.RECURRENCEID]; var reccurenceid = entry[calendars.RECURRENCEID];
if (reccurenceid == undefined) reccurenceid = null; if (reccurenceid == undefined) reccurenceid = null;
calendars.removeEntryByUID(calendars.VEVENT, vars.get("$sys.user"), entry[calendars.ID], reccurenceid) calendars.removeEntryByUID(calendars.VEVENT, vars.get("$sys.user"), entry[calendars.ID], reccurenceid)
} }
if(vars.exists("$sys.ancestorimageuid") && vars.get("$sys.ancestorimageuid") != null) if(vars.exists("$sys.ancestorimageuid") && vars.get("$sys.ancestorimageuid") != null)
{ {
neon.closeImage(vars.getString("$sys.currentimage"), true); neon.closeImage(vars.getString("$sys.currentimage"), true);
neon.refresh(vars.get("$sys.ancestorimageuid")); neon.refresh(vars.get("$sys.ancestorimageuid"));
} }
\ No newline at end of file
entity/Appointment_entity/onInsert.js
+ 362
− 362
View file @ 8795c239
This diff is collapsed.
entity/Appointment_entity/onUpdate.js
+ 374
− 374
View file @ 8795c239
This diff is collapsed.
entity/Comm_entity/conditionProcess.js
+ 41
− 26
View file @ 8795c239
import("system.text"); import("system.logging");
import("system.result"); import("system.text");
import("system.vars"); import("system.result");
import("Sql_lib"); import("system.vars");
import("Keyword_lib"); import("Sql_lib");
import("Keyword_lib");
var cond, relId, mediumCategories, keywordUtil;
var cond, relId, mediumCategories, keywordUtil;
cond = "";
if(vars.exists("$param.RelId_param") && (relId = vars.get("$param.RelId_param")) != null){
cond += " and COMM.RELATION_ID in ('" + relId + "')";//TODO: quoting/prevent sql-injection
} cond = "";
if (vars.exists("$param.MediumCategoriesFilter_param") && (mediumCategories = vars.get("$param.MediumCategoriesFilter_param")) != null){ if(vars.exists("$param.RelId_param")){
mediumCategories = text.decodeMS(mediumCategories);
keywordUtil = new KeywordUtils(); relId = vars.get("$param.RelId_param");
var kwd = keywordUtil.createKeyword("COMM.MEDIUM");
kwd.filter(function(id, name, customs){ if (relId != null && relId != "" && relId != undefined)
return mediumCategories.indexOf(customs.category) > -1; {
}); cond += " and COMM.RELATION_ID in ('" + relId + "')";//TODO: quoting/prevent sql-injection
mediumIds = kwd.toArray("id"); }
if (mediumIds.length == 0) }
throw new Error();//TODO: add message if (vars.exists("$param.MediumCategoriesFilter_param")){
cond += " and COMM.MEDIUM_ID in (" + mediumIds.join(", ") + ")"; mediumCategories = vars.get("$param.MediumCategoriesFilter_param");
} if (mediumCategories != null && mediumCategories != "" && mediumCategories != undefined)
{
mediumCategories = text.decodeMS(mediumCategories);
keywordUtil = new KeywordUtils();
var kwd = keywordUtil.createKeyword("COMM.MEDIUM");
kwd.filter(function(id, name, customs){
return mediumCategories.indexOf(customs.category) > -1;
});
mediumIds = kwd.toArray("id");
if (mediumIds.length == 0)
throw new Error();//TODO: add message
cond += " and COMM.MEDIUM_ID in (" + mediumIds.join(", ") + ")";
}
}
result.string(cond ? "1 = 1 " + cond: "1 = 2"); result.string(cond ? "1 = 1 " + cond: "1 = 2");
\ No newline at end of file
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