Compare commits
10 Commits
04a2d9a634
...
59163d47d1
| Author | SHA1 | Date | |
|---|---|---|---|
|
59163d47d1 | ||
|
|
ec35b94f39 | ||
|
|
b0f95dd044 | ||
|
|
ba2af746f2 | ||
|
|
442662fb6b | ||
|
|
a861219867 | ||
| eadbaf389c | |||
| 281fc69df1 | |||
|
|
fbde984e13 | ||
|
|
f32fe8bba2 |
@@ -387,13 +387,13 @@ function model_mld_opdr()
|
||||
"dbs": "mld_opdr_externnr",
|
||||
"label": "externalnr",
|
||||
"typ": "key",
|
||||
"hidden_fld": true
|
||||
"readonly": S("bgt_enabled") || !(user.has("WEB_FACTAB") || user.has("WEB_FACXNR"))
|
||||
},
|
||||
"externalsyncdate": {
|
||||
"dbs": "mld_opdr_externsyncdate",
|
||||
"label": "externalsyncdate",
|
||||
"typ": "datetime",
|
||||
"hidden_fld": true
|
||||
"readonly": S("bgt_enabled") || !(user.has("WEB_FACTAB") || user.has("WEB_FACXNR"))
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1608,8 +1608,6 @@ obj._is_clone=2 --> nieuwe sub-opdracht
|
||||
delete_fld(jsondata, "module", true);
|
||||
delete_fld(jsondata, "additional", true);
|
||||
delete_fld(jsondata, "offer", true);
|
||||
delete_fld(jsondata, "externalnr", true);
|
||||
delete_fld(jsondata, "externalsyncdate", true);
|
||||
}
|
||||
|
||||
this.REST_PUT = function (params, jsondata, the_key)
|
||||
|
||||
@@ -213,12 +213,60 @@ ANONYMOUS_Allowed = 1;
|
||||
|
||||
function load_headerdata()
|
||||
{
|
||||
// Lees de xml-data uit de html-header.
|
||||
var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
|
||||
xmlReq.load(Request);
|
||||
// Converteer de xml naar json-dataobject.
|
||||
var objreq = xmlToJson(xmlReq);
|
||||
return objreq.facilitor;
|
||||
if (debug == 1)
|
||||
{
|
||||
function loadMSXML(x)
|
||||
{
|
||||
var fso = new ActiveXObject("Scripting.FileSystemObject");
|
||||
var file_ext = x.file.slice(-4);
|
||||
var ForReading = 1;
|
||||
var f1 = fso.OpenTextFile(x.file, ForReading );
|
||||
var text = f1.ReadAll();
|
||||
f1.Close();
|
||||
|
||||
text = text.substr(text.indexOf("<facilitor>")); // Verwijder alles totdat je de <facilitor> tag tegenkomt.
|
||||
if ((text.substr(0,14) != "<?xml version=") && (file_ext == ".xml"))
|
||||
{ // Bij ontbreken van encoding in de xml-file treedt de fout
|
||||
// "An invalid character was found in the text content"
|
||||
// op als er diakritische tekens in het xml-bestand staan.
|
||||
// Voeg daarom encoding toe.
|
||||
text = "<?xml version='1.0' encoding='windows-1250'?>" + "\n\r" + text;
|
||||
}
|
||||
|
||||
x.doc = new ActiveXObject("MSXML2.DOMDocument.6.0");
|
||||
x.doc.async = false;
|
||||
x.doc.loadXML(text);
|
||||
x.err_code = x.doc.parseError.errorCode;
|
||||
x.err_msg = (x.doc.parseError.errorCode != 0 ? x.doc.parseError.reason : "");
|
||||
|
||||
return x;
|
||||
}
|
||||
|
||||
var custpath = "../../CUST/PNBR";
|
||||
var loader = { success: false
|
||||
, status: -1
|
||||
, xml: { file: Server.MapPath(custpath + "/xsl/" + "mld_434135_1_transformed.xml") }
|
||||
, xsl: { file: Server.MapPath(custpath + "/xsl/" + "zendesk.xsl") }
|
||||
};
|
||||
loader.xml = loadMSXML(loader.xml);
|
||||
var objreq = xmlToJson(loader.xml.doc);
|
||||
//__Log(objreq);
|
||||
__Log({"headerdata": {"melding": objreq.melding, "topdesk": {"info": objreq.facilitor.topdesk.info, "data": objreq.facilitor.topdesk.data}}});
|
||||
return objreq.facilitor;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Lees de xml-data uit de html-header.
|
||||
var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
|
||||
xmlReq.load(Request);
|
||||
// Converteer de xml naar json-dataobject.
|
||||
var objreq = xmlToJson(xmlReq);
|
||||
if (objreq && objreq.facilitor && objreq.facilitor.melding && objreq.facilitor.topdesk.info && objreq.facilitor.topdesk.data)
|
||||
{
|
||||
__Log({"headerdata": {"melding": objreq.facilitor.melding, "topdesk": {"info": objreq.facilitor.topdesk.info, "data": objreq.facilitor.topdesk.data}}});
|
||||
}
|
||||
return objreq.facilitor;
|
||||
}
|
||||
} // load_headerdata
|
||||
|
||||
function getTypeOf(value)
|
||||
@@ -368,7 +416,7 @@ ANONYMOUS_Allowed = 1;
|
||||
if ((p_obj_topdesk.info.methode == "POST" || p_obj_topdesk.info.methode == "PATCH") && (p_obj_topdesk.info.actie == "change" || p_obj_topdesk.info.actie == "incident"))
|
||||
{
|
||||
var t = (p_obj_topdesk.bijlagen ? getTypeOf(p_obj_topdesk.bijlagen.bijlage) : "isUnknown");
|
||||
__Log("bijlagen: " + t);
|
||||
__Log("bijlagen: " + (t == "isUndefined" ? "<geen>" : t));
|
||||
switch (t)
|
||||
{
|
||||
case "isUndefined": var bijlagen = []; break; // geen bijlagen
|
||||
@@ -503,6 +551,10 @@ ANONYMOUS_Allowed = 1;
|
||||
__Log({"topdesk_result": topdesk_result});
|
||||
if (topdesk_result.status != -1)
|
||||
{ // Nu kunnen de bijlagen verstuurd worden.
|
||||
if (!topdesk_result.data.id)
|
||||
{ // Bij bestaande opdracht het topdesk-id overnemen vanuit de info-node.
|
||||
topdesk_result.data.id = (obj_topdesk.info.get_id ? obj_topdesk.info.get_id : "");
|
||||
}
|
||||
var attach_result = addAttachments(obj_topdesk, topdesk_result);
|
||||
|
||||
var result = { ticket: topdesk_result
|
||||
@@ -539,6 +591,7 @@ ANONYMOUS_Allowed = 1;
|
||||
// *************************************************************************
|
||||
|
||||
__Log("*> TOPdesk.api");
|
||||
var debug = 0;
|
||||
var facilitor = load_headerdata();
|
||||
var result = {};
|
||||
|
||||
|
||||
@@ -62,7 +62,10 @@
|
||||
"fin_factuur": { "track": "#FINUPD",
|
||||
"fields": ["prs_kostensoort_key",
|
||||
"fin_factuur_statuses_key",
|
||||
"fin_factuur_boekmaand"]
|
||||
"fin_factuur_boekmaand",
|
||||
"mld_opdr_key",
|
||||
"cnt_contract_key",
|
||||
"bes_bestelopdr_key"]
|
||||
},
|
||||
"fin_verkoopfactuur":
|
||||
{ "track": null,
|
||||
@@ -139,7 +142,9 @@
|
||||
"prs_perslid": { "track": "#PRSUPD",
|
||||
"fields": ["prs_perslid_lang",
|
||||
"prs_perslid_flags",
|
||||
"prs_perslid_inactief"]
|
||||
"prs_perslid_inactief",
|
||||
"prs_perslid_key_verantw",
|
||||
"prs_perslid_mobiel"]
|
||||
},
|
||||
"fac_bookmark": { "track": null,
|
||||
"fields": ["fac_bookmark_id"]
|
||||
@@ -187,6 +192,8 @@
|
||||
{
|
||||
var field = model.fields[fld];
|
||||
var exception = edit_fields[table.toLowerCase()];
|
||||
if (fld == "prs_perslid_key_verantw")
|
||||
field.foreign = "PRS_PERSLID";
|
||||
if (fld == model.soft_delete ||
|
||||
fld.match(/externsyncdate$/) ||
|
||||
fld.match(/extsyncdate$/) ||
|
||||
@@ -209,7 +216,7 @@
|
||||
field.track = true;
|
||||
model.trackcode = exception && exception.track;
|
||||
|
||||
if (mode == "edit" && fld == "alg_verdieping_key") // Scaffolding.inc genereert geen selector voor verdiepingen en maakt hem zelfs readonly
|
||||
if (mode == "edit" && (fld == "alg_verdieping_key" || fld == "cnt_contract_key" || fld == "mld_opdr_key")) // Scaffolding.inc genereert geen selector voor verdiepingen enz en maakt hem zelfs readonly
|
||||
field.foreign = null;
|
||||
|
||||
continue;
|
||||
|
||||
@@ -7100,7 +7100,7 @@ mld = {
|
||||
+ " ORDER BY prio DESC"
|
||||
+ " FETCH FIRST 1 ROW ONLY";
|
||||
var oRs_c = Oracle.Execute(sql_c);
|
||||
if (oRs_c("aantal").Value == 1)
|
||||
if (!oRs_c.EOF && oRs_c("aantal").Value == 1)
|
||||
{
|
||||
prs_bedrijf_key = oRs_c("cnt_prs_bedrijf_key").Value;
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
Context: Vanuit ELK asp bestand
|
||||
*/
|
||||
|
||||
var FCLTVersion="2025.2c";
|
||||
var FCLTVersion="2025.2d";
|
||||
var FCLTMinDatabaseSchema="51"; // Alleen de cijfers
|
||||
|
||||
var custpath = rooturl + "/cust/" + customerId; // path to customer files
|
||||
|
||||
Reference in New Issue
Block a user