admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MARX#54168 API api_opdrsoap.asp ondersteunt bij kenmerken 'alleen' de naam als attribuut

Browse Source 
svn path=/Website/trunk/; revision=38942
This commit is contained in:
Alex Tiehuis
2018-08-24 07:49:01 +00:00
parent 362fcbe8a0
commit 227a7e177c
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
APPL/API/api_mldsoap.asp
View File

@@ -576,7 +576,24 @@ function upsertKenmerk(kenmerken, stdmld_key, mld_key)
{
for (j=0; j < kenmerken.length; j++)
{
var kenmerk_attr_key = kenmerken[j].getAttribute("key");
var kenmerk_attr_code = kenmerken[j].getAttribute("code");
var kenmerk_naam = kenmerken[j].getAttribute("naam");
// default srtkenmerk on name
var srtkenmerk_key_code_omschr = " AND sk.mld_srtkenmerk_upper = " + safe.quoted_sql_upper(kenmerk_naam);
switch (true) {
// first choice is srtkenmerk on key
case (kenmerk_attr_key != null): {
srtkenmerk_key_code_omschr = " AND sk.mld_srtkenmerk_key = " + safe.quoted_sql_upper(kenmerk_attr_key);
break;
}
// second choice is srtkenmerk on code
case (kenmerk_attr_code != null): {
srtkenmerk_key_code_omschr = " AND UPPER(sk.mld_srtkenmerk_code) = " + safe.quoted_sql_upper(kenmerk_attr_code);
break;
}
}
if (kenmerken[j].childNodes.length > 0)
var kenmerk_waarde = kenmerken[j].childNodes[0].nodeValue;
else
@@ -591,7 +608,7 @@ function upsertKenmerk(kenmerken, stdmld_key, mld_key)
+ " WHERE s.mld_ins_discipline_key = d.ins_discipline_key"
+ " AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key "
+ " AND k.mld_kenmerk_verwijder IS NULL "
+ " AND sk.mld_srtkenmerk_upper = " + safe.quoted_sql_upper(kenmerk_naam)
+ srtkenmerk_key_code_omschr
+ " AND s.mld_ins_discipline_key = d.ins_discipline_key"
+ " AND s.mld_stdmelding_key = " + stdmld_key
+ " AND ((k.mld_stdmelding_key = s.mld_stdmelding_key AND k.mld_kenmerk_niveau = 'S')"

18
APPL/API/api_opdrsoap.asp
View File

@@ -820,7 +820,23 @@ for (i=0; i < opdrachten.length; i++)
//Response.Write("lengte:"+ opdrkenmerken.length);
for (j=0; j < opdrkenmerken.length; j++)
{
var kenmerk_attr_key = opdrkenmerken[j].getAttribute("key");
var kenmerk_attr_code = opdrkenmerken[j].getAttribute("code");
var kenmerk_naam = opdrkenmerken[j].getAttribute("naam");
// default srtkenmerk on name
var srtkenmerk_key_code_omschr = " AND sk.mld_srtkenmerk_upper = " + safe.quoted_sql_upper(kenmerk_naam);
switch (true) {
// first choice is srtkenmerk on key
case (kenmerk_attr_key != null): {
srtkenmerk_key_code_omschr = " AND sk.mld_srtkenmerk_key = " + safe.quoted_sql_upper(kenmerk_attr_key);
break;
}
// second choice is srtkenmerk on code
case (kenmerk_attr_code != null): {
srtkenmerk_key_code_omschr = " AND UPPER(sk.mld_srtkenmerk_code) = " + safe.quoted_sql_upper(kenmerk_attr_code);
break;
}
}
if (opdrkenmerken[j].childNodes.length > 0)
var kenmerk_waarde = opdrkenmerken[j].childNodes[0].nodeValue;
else
@@ -832,7 +848,7 @@ for (i=0; i < opdrachten.length; i++)
+ " WHERE k.mld_typeopdr_key = " + topdr_key
+ " AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key "
+ " AND k.mld_kenmerk_verwijder IS NULL "
+ " AND sk.mld_srtkenmerk_upper = " + safe.quoted_sql_upper(kenmerk_naam);
+ srtkenmerk_key_code_omschr;
var oRs = Oracle.Execute(ksql);
if (!oRs.eof)