Merge 2025.2 Gold E patches

svn path=/Website/trunk/; revision=70599

APPL/API2/model_mld_opdr.inc

@@ -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"))
         }
     };
 
@@ -1629,8 +1629,6 @@ function model_mld_opdr()
       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)

APPL/EXP/topdesk.asp

@@ -213,12 +213,57 @@ 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);
+            __Log({"headerdata": {"melding": objreq.melding, "topdesk": {"info": objreq.topdesk.info, "data": objreq.topdesk.data}}});
+            return objreq.facilitor;
+        }
     }   // load_headerdata
 
     function getTypeOf(value)
@@ -503,6 +548,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 +588,7 @@ ANONYMOUS_Allowed = 1;
     // *************************************************************************
 
     __Log("*> TOPdesk.api");
+    var debug = 0;
     var facilitor = load_headerdata();
     var result = {};
 

APPL/MGT/mgt_generic.asp

@@ -143,7 +143,8 @@
                                              "fields": ["prs_perslid_lang",
                                                         "prs_perslid_flags",
                                                         "prs_perslid_inactief",
-                                                        "prs_perslid_key_verantw"]
+                                                        "prs_perslid_key_verantw",
+                                                        "prs_perslid_mobiel"]
                                            },
                         "fac_bookmark":    { "track": null,
                                              "fields": ["fac_bookmark_id"]