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

PNBR#23734 zoeken op filterveld in rapportages kan niet op * als wildcard

Browse Source 
svn path=/Website/trunk/; revision=11971
This commit is contained in:
Erik Groener
2012-08-01 13:26:20 +00:00
parent 87ae8c6f37
commit a0549a00c5
48 changed files with 117 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/ALG/alg_ruimte_list.inc
View File

@@ -153,12 +153,12 @@ function ruimte_list(pautfunction, params)
if (area_nr) if (area_nr)
{ {
sqln += " AND UPPER(r.alg_ruimte_nr) LIKE " + safe.quoted_sql_upper("%" + area_nr + "%"); sqln += " AND UPPER(r.alg_ruimte_nr) LIKE " + safe.quoted_sql_wild("%" + area_nr + "%");
} }
if (area_descr) if (area_descr)
{ {
sqln += " AND UPPER(r.alg_ruimte_omschrijving) LIKE " + safe.quoted_sql_upper("%" + area_descr + "%"); sqln += " AND UPPER(r.alg_ruimte_omschrijving) LIKE " + safe.quoted_sql_wild("%" + area_descr + "%");
} }
sqln += " ORDER BY l.alg_locatie_upper ASC" sqln += " ORDER BY l.alg_locatie_upper ASC"

2
APPL/ALG/alg_terreinsector_list.inc
View File

@@ -131,7 +131,7 @@ function terrein_list(pautfunction, params)
if (ter_code) if (ter_code)
{ {
sqln += " AND UPPER(g.ALG_TERREINSECTOR_CODE) LIKE " + safe.quoted_sql_upper("%" + ter_code + "%"); sqln += " AND UPPER(g.ALG_TERREINSECTOR_CODE) LIKE " + safe.quoted_sql_wild("%" + ter_code + "%");
} }
sqln += " ORDER BY g.alg_terreinsector_upper ASC " sqln += " ORDER BY g.alg_terreinsector_upper ASC "

2
APPL/API/api_SOAP.asp
View File

@@ -70,7 +70,7 @@ var logall=0; // handig met testen
{ {
if (filterName == xx) if (filterName == xx)
{ {
wheres.push("UPPER("+requestData.filter[xx] + ") LIKE " + safe.quoted_sql_upper(filters[i].text + "%")) wheres.push("UPPER("+requestData.filter[xx] + ") LIKE " + safe.quoted_sql_wild(filters[i].text + "%"))
} }
} }
} }

10
APPL/BES/bes_list.inc
View File

@@ -225,7 +225,7 @@ function bes_list (pautfunction, params)
? " AND bes_srtdeel_key IN" ? " AND bes_srtdeel_key IN"
+ " (SELECT bes_srtdeel_key" + " (SELECT bes_srtdeel_key"
+ " FROM bes_srtdeel" + " FROM bes_srtdeel"
+ " WHERE UPPER(bes_srtdeel_omschrijving) LIKE " + safe.quoted_sql_upper("%" + pitem + "%") + " WHERE UPPER(bes_srtdeel_omschrijving) LIKE " + safe.quoted_sql_wild("%" + pitem + "%")
+ ")" + ")"
: "") : "")
+ ")"; + ")";
@@ -239,7 +239,7 @@ function bes_list (pautfunction, params)
+ " FROM bes_srtdeel" + " FROM bes_srtdeel"
+ " WHERE bes_srtgroep_key = " + pgroep_key + " WHERE bes_srtgroep_key = " + pgroep_key
+ ((pitem && (fronto || backo)) + ((pitem && (fronto || backo))
? " AND UPPER(bes_srtdeel_omschrijving) LIKE " + safe.quoted_sql_upper("%" + pitem + "%") ? " AND UPPER(bes_srtdeel_omschrijving) LIKE " + safe.quoted_sql_wild("%" + pitem + "%")
: "") : "")
+ "))"; + "))";
} }
@@ -256,7 +256,7 @@ function bes_list (pautfunction, params)
+ " WHERE ins_discipline_key = " + pcatalogus_key + " WHERE ins_discipline_key = " + pcatalogus_key
+ ")" + ")"
+ ((pitem && (fronto || backo)) + ((pitem && (fronto || backo))
? " AND UPPER(bes_srtdeel_omschrijving) LIKE " + safe.quoted_sql_upper("%" + pitem + "%") ? " AND UPPER(bes_srtdeel_omschrijving) LIKE " + safe.quoted_sql_wild("%" + pitem + "%")
: "") : "")
+ "))"; + "))";
} }
@@ -937,7 +937,7 @@ function bes_list (pautfunction, params)
if (rfo_key) if (rfo_key)
{ {
sql_filter += " AND b.bes_bestelopdr_id LIKE " + safe.quoted_sql_upper(rfo_key + "%"); sql_filter += " AND b.bes_bestelopdr_id LIKE " + safe.quoted_sql_wild(rfo_key + "%");
} }
else else
{ {
@@ -1418,7 +1418,7 @@ function bes_list (pautfunction, params)
sql += " AND b.prs_perslid_key = " + requestor_key; sql += " AND b.prs_perslid_key = " + requestor_key;
} }
if (kp) if (kp)
sql += " AND k.prs_kostenplaats_upper LIKE " + safe.quoted_sql_upper(kp + "%"); sql += " AND k.prs_kostenplaats_upper LIKE " + safe.quoted_sql_wild(kp + "%");
if (dep_key) if (dep_key)
sql += " AND p.prs_afdeling_key = " + dep_key; sql += " AND p.prs_afdeling_key = " + dep_key;
if (authparams.ALGreadlevel >= 0) if (authparams.ALGreadlevel >= 0)

4
APPL/BES/bes_voorraad_list.inc
View File

@@ -244,8 +244,8 @@ function bes_voorraad_list (pautfunction, params)
? " WHERE inkoop_disc = " + params.catalogus_key ? " WHERE inkoop_disc = " + params.catalogus_key
: "") : "")
+ (params.searchtekst + (params.searchtekst
? (params.catalogus_key? " AND" : " WHERE") + " (UPPER(bes_srtdeel_nr) LIKE " + safe.quoted_sql_upper("%" + params.searchtekst + "%") ? (params.catalogus_key? " AND" : " WHERE") + " (UPPER(bes_srtdeel_nr) LIKE " + safe.quoted_sql_wild("%" + params.searchtekst + "%")
+ " OR UPPER("+ lcl.xsql('bes_srtdeel_omschrijving','sd.bes_srtdeel_key') +") LIKE " + safe.quoted_sql_upper("%" + params.searchtekst + "%") + ")" + " OR UPPER("+ lcl.xsql('bes_srtdeel_omschrijving','sd.bes_srtdeel_key') +") LIKE " + safe.quoted_sql_wild("%" + params.searchtekst + "%") + ")"
: "") : "")
+ " GROUP BY bes_srtdeel_nr" + " GROUP BY bes_srtdeel_nr"
+ ", "+ lcl.xsql('bes_srtdeel_omschrijving','sd.bes_srtdeel_key') + ", "+ lcl.xsql('bes_srtdeel_omschrijving','sd.bes_srtdeel_key')

2
APPL/BES/opdr_list.inc
View File

@@ -189,7 +189,7 @@ function opdr_list (pautfunction, params)
} }
if (item) if (item)
sql += " AND UPPER(isd.bes_srtdeel_omschrijving) LIKE " + safe.quoted_sql_upper("%" + item + "%"); sql += " AND UPPER(isd.bes_srtdeel_omschrijving) LIKE " + safe.quoted_sql_wild("%" + item + "%");
// AND b.bes_bestelopdr_key IN (...item_key...) hoef niet gebruikt te worden omdat geen bedragen worden getoond. // AND b.bes_bestelopdr_key IN (...item_key...) hoef niet gebruikt te worden omdat geen bedragen worden getoond.
if (item_key) if (item_key)

2
APPL/CAD/cad_tekening_list.inc
View File

@@ -173,7 +173,7 @@ function tekening_list(pautfunction, params)
if (bstndnm) if (bstndnm)
{ {
sqln += " AND UPPER(t.cad_tekening_filenaam) LIKE " + safe.quoted_sql_upper("%" + bstndnm + "%") sqln += " AND UPPER(t.cad_tekening_filenaam) LIKE " + safe.quoted_sql_wild("%" + bstndnm + "%")
} }
sqln += " ORDER BY UPPER (t.alg_locatie_omschrijving)" sqln += " ORDER BY UPPER (t.alg_locatie_omschrijving)"

2
APPL/CAD/lbl_search.asp
View File

@@ -99,7 +99,7 @@ var pLabel = getQParamInt("label");
+ " AND al.alg_locatie_key = ag.alg_locatie_key" + " AND al.alg_locatie_key = ag.alg_locatie_key"
+ " AND ag.alg_gebouw_key = av.alg_gebouw_key" + " AND ag.alg_gebouw_key = av.alg_gebouw_key"
+ " AND av.alg_verdieping_key = ar.alg_verdieping_key" + " AND av.alg_verdieping_key = ar.alg_verdieping_key"
+ " AND UPPER(th.waarde) LIKE " + safe.quoted_sql_upper(lblCode + "%"); + " AND UPPER(th.waarde) LIKE " + safe.quoted_sql_wild(lblCode + "%");
if (loc != -1) sql = sql + " AND al.alg_locatie_key = " + loc; if (loc != -1) sql = sql + " AND al.alg_locatie_key = " + loc;

4
APPL/CAD/obj_search.asp
View File

@@ -107,8 +107,8 @@ var discs = getQParamIntArray("discs", []); // Komma separated list of ins_disci
+ " AND s.ins_srtdeel_key = g.ins_srtdeel_key"; + " AND s.ins_srtdeel_key = g.ins_srtdeel_key";
if (loc != -1) sql = sql + " AND g.ins_alg_locatie_key = " + loc; if (loc != -1) sql = sql + " AND g.ins_alg_locatie_key = " + loc;
sql = sql + " AND g.ins_deel_upper LIKE " + safe.quoted_sql_upper(objCode + "%") sql = sql + " AND g.ins_deel_upper LIKE " + safe.quoted_sql_wild(objCode + "%")
if(discs.length > 0 && discs.join(",").indexOf("-1") == -1) if(discs.length > 0 && discs.join(",").indexOf("-1") == -1)
{ {
sql = sql + " and ins_discipline_key IN (" + discs.join(",") + ")"; sql = sql + " and ins_discipline_key IN (" + discs.join(",") + ")";

2
APPL/FAC/fac_admtracking_list.asp
View File

@@ -42,7 +42,7 @@ FCLTHeader.Requires({ plugins: ["jQuery"] })
+ " adm_tracking_osuser" + " adm_tracking_osuser"
+ " FROM adm_tracking at1 WHERE 1=1" + " FROM adm_tracking at1 WHERE 1=1"
+ (zoek != -1 + (zoek != -1
? " AND UPPER(adm_tracking_name) LIKE " + safe.quoted_sql_upper(zoek + "%") ? " AND UPPER(adm_tracking_name) LIKE " + safe.quoted_sql_wild(zoek + "%")
: "") : "")
+ (since?" AND adm_tracking_date > " + since.toSQL():"") + (since?" AND adm_tracking_date > " + since.toSQL():"")
+ (laatste? " AND adm_tracking_date = (SELECT MAX(adm_tracking_date) FROM adm_tracking at2 WHERE at2.adm_tracking_name = at1.adm_tracking_name)":"") + (laatste? " AND adm_tracking_date = (SELECT MAX(adm_tracking_date) FROM adm_tracking at2 WHERE at2.adm_tracking_name = at1.adm_tracking_name)":"")

6
APPL/FAC/fac_adres_list.asp
View File

@@ -68,7 +68,7 @@ var showall = getQParamInt("showall", 0) == 1;
: ""); : "");
if (adressName != "") if (adressName != "")
sql+= " AND m.mld_adres_upper LIKE " + safe.quoted_sql_upper(adressName + "%"); sql+= " AND m.mld_adres_upper LIKE " + safe.quoted_sql_wild(adressName + "%");
if (locatiekey != -1) if (locatiekey != -1)
sql+= " AND l.alg_locatie_key = " + locatiekey; sql+= " AND l.alg_locatie_key = " + locatiekey;
@@ -76,9 +76,9 @@ var showall = getQParamInt("showall", 0) == 1;
sql+= " AND l.alg_district_key = " + districtkey; sql+= " AND l.alg_district_key = " + districtkey;
if (bezoekPostcode != "") if (bezoekPostcode != "")
sql+= " AND UPPER(m.mld_adres_bezoek_postcode) LIKE " + safe.quoted_sql_upper(bezoekPostcode + "%"); sql+= " AND UPPER(m.mld_adres_bezoek_postcode) LIKE " + safe.quoted_sql_wild(bezoekPostcode + "%");
if (bezoekPlaats != "") if (bezoekPlaats != "")
sql+= " AND UPPER(m.mld_adres_bezoek_plaats) LIKE " + safe.quoted_sql_upper(bezoekPlaats + "%"); sql+= " AND UPPER(m.mld_adres_bezoek_plaats) LIKE " + safe.quoted_sql_wild(bezoekPlaats + "%");
sql+= " ORDER BY UPPER (m.mld_adres_naam)"; sql+= " ORDER BY UPPER (m.mld_adres_naam)";

8
APPL/FAC/fac_locale_list.asp
View File

@@ -76,8 +76,8 @@ if (vSearchGroep == "lang")
sqln += " AND (L.fac_locale_default, l.fac_locale_kolomkeyval) IN " sqln += " AND (L.fac_locale_default, l.fac_locale_kolomkeyval) IN "
+ "(SELECT fac_locale_default, fac_locale_kolomkeyval " + "(SELECT fac_locale_default, fac_locale_kolomkeyval "
+ " FROM fac_v_locale_kolom F " + " FROM fac_v_locale_kolom F "
+ " WHERE ( (UPPER(F.fac_locale_tekst) LIKE "+safe.quoted_sql_upper("%"+vSearchString+"%") + ") " + " WHERE ( (UPPER(F.fac_locale_tekst) LIKE "+safe.quoted_sql_wild("%"+vSearchString+"%") + ") "
+ "OR (UPPER(F.fac_locale_default) LIKE "+safe.quoted_sql_upper("%"+vSearchString+"%") + ") " + "OR (UPPER(F.fac_locale_default) LIKE "+safe.quoted_sql_wild("%"+vSearchString+"%") + ") "
+ ") " + ") "
+ ") "; + ") ";
} }
@@ -125,8 +125,8 @@ else
sqln += " AND (l.fac_locale_dialect_key, l.fac_locale_lang) IN " sqln += " AND (l.fac_locale_dialect_key, l.fac_locale_lang) IN "
+ "(SELECT fac_locale_dialect_key, fac_locale_lang " + "(SELECT fac_locale_dialect_key, fac_locale_lang "
+ " FROM fac_v_locale_lcl F " + " FROM fac_v_locale_lcl F "
+ " WHERE ( (UPPER(F.fac_locale_tekst) LIKE " + safe.quoted_sql_upper("%" + vSearchString + "%") + ") " + " WHERE ( (UPPER(F.fac_locale_tekst) LIKE " + safe.quoted_sql_wild("%" + vSearchString + "%") + ") "
+ "OR (UPPER(F.fac_localeitems_lcl) LIKE " + safe.quoted_sql_upper("%" + vSearchString + "%") + ") " + "OR (UPPER(F.fac_localeitems_lcl) LIKE " + safe.quoted_sql_wild("%" + vSearchString + "%") + ") "
+ ") " + ") "
+ ") "; + ") ";
} }

6
APPL/FAC/fac_locale_list_std.asp
View File

@@ -65,9 +65,9 @@ var vWhere = "";
sqln += " AND (fac_locale_xsl_label) IN " sqln += " AND (fac_locale_xsl_label) IN "
+ "(SELECT fac_locale_xsl_label " + "(SELECT fac_locale_xsl_label "
+ " FROM fac_locale_xsl " + " FROM fac_locale_xsl "
+ " WHERE ( (UPPER(fac_locale_xsl_label) LIKE "+safe.quoted_sql_upper("%"+vSearchString+"%") + ") " + " WHERE ( (UPPER(fac_locale_xsl_label) LIKE "+safe.quoted_sql_wild("%"+vSearchString+"%") + ") "
+ "OR (UPPER(fac_locale_xsl_tekst) LIKE "+safe.quoted_sql_upper("%"+vSearchString+"%") + ") " + "OR (UPPER(fac_locale_xsl_tekst) LIKE "+safe.quoted_sql_wild("%"+vSearchString+"%") + ") "
+ "OR (UPPER(fac_locale_xsl_cust) LIKE "+safe.quoted_sql_upper("%"+vSearchString+"%") + ") " + "OR (UPPER(fac_locale_xsl_cust) LIKE "+safe.quoted_sql_wild("%"+vSearchString+"%") + ") "
+ ") " + ") "
+ ") "; + ") ";
} }

2
APPL/FAC/fac_menu_list.asp
View File

@@ -120,7 +120,7 @@ FCLTHeader.Requires({ plugins: ["jQuery"],
? " AND fac_locale_xsl_label(+) = fac_menuitems_label" ? " AND fac_locale_xsl_label(+) = fac_menuitems_label"
+ " AND fac_locale_xsl_module(+) = 'ASP'" + " AND fac_locale_xsl_module(+) = 'ASP'"
+ " AND fac_locale_xsl_lang(+) = " + safe.quoted_sql(user.lang()) + " AND fac_locale_xsl_lang(+) = " + safe.quoted_sql(user.lang())
+ " AND UPPER(COALESCE(fac_locale_xsl_cust, fac_locale_xsl_tekst, fac_menuitems_label)) LIKE " + safe.quoted_sql_upper("%" + tekst + "%") + " AND UPPER(COALESCE(fac_locale_xsl_cust, fac_locale_xsl_tekst, fac_menuitems_label)) LIKE " + safe.quoted_sql_wild("%" + tekst + "%")
: "") : "")
+ " ORDER BY fac_menuitems_groep, fac_menu_volgnr, fac_menuitems_label"; + " ORDER BY fac_menuitems_groep, fac_menu_volgnr, fac_menuitems_label";

2
APPL/FAC/fac_usrrap_worker.asp
View File

@@ -54,7 +54,7 @@ for (var i = 1; i <= aantalcolvalue; i++)
if (p_colName != colname) if (p_colName != colname)
{ {
requireFilterCol(p_tableName, colname); // Safety check voor kolomnaam requireFilterCol(p_tableName, colname); // Safety check voor kolomnaam
sqlWhere += (sqlWhere == ""? " WHERE " : " AND ") + " UPPER(" + colname + ") LIKE " + safe.quoted_sql_upper(colvalue); sqlWhere += (sqlWhere == ""? " WHERE " : " AND ") + " UPPER(" + colname + ") LIKE " + safe.quoted_sql_wild(colvalue);
} }
} }
sql += sqlWhere; sql += sqlWhere;

2
APPL/FAC/fac_widget_list.asp
View File

@@ -36,7 +36,7 @@ var srch = getQParam("searchtext", "");
+ " fac_functie_key " + " fac_functie_key "
+ " FROM fac_widget" + " FROM fac_widget"
+ " WHERE 1=1 " + " WHERE 1=1 "
+ (fwg != -1 ? " AND UPPER(fac_widget_groep) LIKE " + safe.quoted_sql_upper(fwg) : "") + (fwg != -1 ? " AND UPPER(fac_widget_groep) LIKE " + safe.quoted_sql_wild(fwg) : "")
+ (srch != "" ? " AND UPPER(fac_widget_title) LIKE " + safe.quoted_sql_wild(srch) : "") + (srch != "" ? " AND UPPER(fac_widget_title) LIKE " + safe.quoted_sql_wild(srch) : "")
+ " ORDER BY fac_widget_groep, fac_widget_volgnr"; + " ORDER BY fac_widget_groep, fac_widget_volgnr";

10
APPL/FIN/fin_list.inc
View File

@@ -321,7 +321,7 @@ function fin_list (params)
} }
if (finnum) // mag fin_key of fin_factuur_nr zijn if (finnum) // mag fin_key of fin_factuur_nr zijn
sql += " AND (f.fin_factuur_key = fac.safe_to_number(" + safe.quoted_sql(finnum) + ") OR UPPER(f.fin_factuur_nr) LIKE " + safe.quoted_sql_upper(finnum) + ")"; sql += " AND (f.fin_factuur_key = fac.safe_to_number(" + safe.quoted_sql(finnum) + ") OR UPPER(f.fin_factuur_nr) LIKE " + safe.quoted_sql_wild(finnum) + ")";
if (budh_key) if (budh_key)
sql += " AND budgethouder = " + budh_key; sql += " AND budgethouder = " + budh_key;
@@ -356,16 +356,16 @@ function fin_list (params)
} }
if (!fin_type || fin_type == "O") { if (!fin_type || fin_type == "O") {
subsql[ii++] = " UPPER(sd.ins_srtdiscipline_prefix)||o.mld_melding_key LIKE " + safe.quoted_sql_upper(ordbase) subsql[ii++] = " UPPER(sd.ins_srtdiscipline_prefix)||o.mld_melding_key LIKE " + safe.quoted_sql_wild(ordbase)
+ (volgnr?"AND o.mld_opdr_bedrijfopdr_volgnr = " + volgnr:""); + (volgnr?"AND o.mld_opdr_bedrijfopdr_volgnr = " + volgnr:"");
} }
if (!fin_type || fin_type=="C") { if (!fin_type || fin_type=="C") {
subsql[ii++] = " ('C'||c.cnt_contract_nummer_intern LIKE " + safe.quoted_sql_upper(ordbase) subsql[ii++] = " ('C'||c.cnt_contract_nummer_intern LIKE " + safe.quoted_sql_wild(ordbase)
+ (volgnr?"AND c.cnt_contract_versie = " + volgnr:"") + (volgnr?"AND c.cnt_contract_versie = " + volgnr:"")
+ " )"; + " )";
} }
if (!fin_type || fin_type=="B") { if (!fin_type || fin_type=="B") {
subsql[ii++] = " (bo.bes_bestelopdr_id LIKE " + safe.quoted_sql_upper(opdrnr+"%") + ")"; subsql[ii++] = " (bo.bes_bestelopdr_id LIKE " + safe.quoted_sql_wild(opdrnr+"%") + ")";
} }
sql += " AND ("+ subsql.join(" OR ")+")"; sql += " AND ("+ subsql.join(" OR ")+")";
} }
@@ -376,7 +376,7 @@ function fin_list (params)
sql += " AND f.fin_factuur_statuses_key = " + finstatus; sql += " AND f.fin_factuur_statuses_key = " + finstatus;
if (debtor) if (debtor)
sql += " AND UPPER(f.fin_factuur_debiteur_nr) LIKE " + safe.quoted_sql_upper(debtor); sql += " AND UPPER(f.fin_factuur_debiteur_nr) LIKE " + safe.quoted_sql_wild(debtor);
if (params.opdr_key) if (params.opdr_key)
sql += " AND f.mld_opdr_key = " + params.opdr_key; sql += " AND f.mld_opdr_key = " + params.opdr_key;

4
APPL/INS/ins_flexkenmerk.inc
View File

@@ -190,8 +190,8 @@ function generateFlexKenmerkCode(params)
+ " OR(k.ins_srtinstallatie_key = g.ins_discipline_key" + " OR(k.ins_srtinstallatie_key = g.ins_discipline_key"
+ " AND k.ins_kenmerk_niveau = 'D'))" + " AND k.ins_kenmerk_niveau = 'D'))"
+ (srtdeel_oms && srtdeel_oms != "" + (srtdeel_oms && srtdeel_oms != ""
? " AND ( (ins_srtdeel_upper LIKE " + safe.quoted_sql_upper("%" + srtdeel_oms + "%") + ")" ? " AND ( (ins_srtdeel_upper LIKE " + safe.quoted_sql_wild("%" + srtdeel_oms + "%") + ")"
+ " OR (ins_srtdeel_code_upper LIKE " + safe.quoted_sql_upper("%" + srtdeel_oms + "%") + "))" + " OR (ins_srtdeel_code_upper LIKE " + safe.quoted_sql_wild("%" + srtdeel_oms + "%") + "))"
: "") : "")
+ (lendout // Bij uitlenen alleen kenmerken met volgnummer 900 en hoger. + (lendout // Bij uitlenen alleen kenmerken met volgnummer 900 en hoger.
? " AND k.ins_kenmerk_volgnummer >= 900" ? " AND k.ins_kenmerk_volgnummer >= 900"

6
APPL/INS/ins_list.inc
View File

@@ -719,10 +719,10 @@ function ins_list (pautfunction, params)
sql_ex += " AND ins_discipline_key IN (" + disc_key + ")"; sql_ex += " AND ins_discipline_key IN (" + disc_key + ")";
if (deel) if (deel)
sql_ex += " AND ins_deel_upper LIKE " + safe.quoted_sql_upper("%" + deel + "%"); sql_ex += " AND ins_deel_upper LIKE " + safe.quoted_sql_wild("%" + deel + "%");
if (objsrt_oms) if (objsrt_oms)
sql_ex += " AND ( (ins_srtdeel_upper LIKE " + safe.quoted_sql_upper("%" + objsrt_oms + "%") + ")" sql_ex += " AND ( (ins_srtdeel_upper LIKE " + safe.quoted_sql_wild("%" + objsrt_oms + "%") + ")"
+ " OR (ins_srtdeel_code_upper LIKE " + safe.quoted_sql_upper("%" + objsrt_oms + "%") + "))"; + " OR (ins_srtdeel_code_upper LIKE " + safe.quoted_sql_wild("%" + objsrt_oms + "%") + "))";
// Nu filtercondities voor flexkenmerken toevoegen // Nu filtercondities voor flexkenmerken toevoegen
sql_ex += getKenmerkSql("INS", "i.ins_deel_key"); sql_ex += getKenmerkSql("INS", "i.ins_deel_key");

4
APPL/INS/ins_srtdeel_search_list.asp
View File

@@ -63,8 +63,8 @@ var transitParam = buildTransitParam(["disc_key", "srtgroep_key"]);
if (srtgroep_key>0) if (srtgroep_key>0)
sql += " AND sg.ins_srtgroep_key = " + srtgroep_key; sql += " AND sg.ins_srtgroep_key = " + srtgroep_key;
if (srtdeel) if (srtdeel)
sql += " AND (s.ins_srtdeel_code_upper LIKE " + safe.quoted_sql_upper("%" + srtdeel + "%") sql += " AND (s.ins_srtdeel_code_upper LIKE " + safe.quoted_sql_wild("%" + srtdeel + "%")
+ " OR s.ins_srtdeel_upper LIKE " + safe.quoted_sql_upper("%" + srtdeel + "%") + ")" + " OR s.ins_srtdeel_upper LIKE " + safe.quoted_sql_wild("%" + srtdeel + "%") + ")"
sql += " ORDER BY ins_srtdeel_code, ins_srtdeel_omschrijving, ins_discipline_omschrijving, ins_srtgroep_omschrijving"; sql += " ORDER BY ins_srtdeel_code, ins_srtdeel_omschrijving, ins_discipline_omschrijving, ins_srtgroep_omschrijving";
/********************************** /**********************************

10
APPL/MLD/opdr_list.inc
View File

@@ -377,13 +377,13 @@ function opdr_list (params)
// Dit is een potentieel en onvermijdelijk dure zoekactie. // Dit is een potentieel en onvermijdelijk dure zoekactie.
// Conform meldingen // Conform meldingen
if (searchtekst) if (searchtekst)
sql += " AND (UPPER(mld_opdr_omschrijving) LIKE " + safe.quoted_sql_upper("%" + searchtekst + "%") sql += " AND (UPPER(mld_opdr_omschrijving) LIKE " + safe.quoted_sql_wild("%" + searchtekst + "%")
+ " OR UPPER(mld_opdr_opmerking) LIKE " + safe.quoted_sql_upper("%" + searchtekst + "%") + " OR UPPER(mld_opdr_opmerking) LIKE " + safe.quoted_sql_wild("%" + searchtekst + "%")
+ " OR EXISTS (SELECT mld_opdr_key" + " OR EXISTS (SELECT mld_opdr_key"
+ " FROM mld_kenmerkopdr ko" + " FROM mld_kenmerkopdr ko"
+ " WHERE ko.mld_opdr_key = o.mld_opdr_key" + " WHERE ko.mld_opdr_key = o.mld_opdr_key"
+ " AND ko.mld_kenmerkopdr_verwijder IS NULL" + " AND ko.mld_kenmerkopdr_verwijder IS NULL"
+ " AND UPPER(ko.mld_kenmerkopdr_waarde) LIKE " + safe.quoted_sql_upper("%" + searchtekst + "%") + "))"; + " AND UPPER(ko.mld_kenmerkopdr_waarde) LIKE " + safe.quoted_sql_wild("%" + searchtekst + "%") + "))";
if (loc_key) if (loc_key)
sql += " AND m.mld_alg_locatie_key = " + loc_key; sql += " AND m.mld_alg_locatie_key = " + loc_key;
@@ -396,8 +396,8 @@ function opdr_list (params)
sql += " AND m.prs_kostenplaats_key IN" sql += " AND m.prs_kostenplaats_key IN"
+ " (SELECT k.prs_kostenplaats_key" + " (SELECT k.prs_kostenplaats_key"
+ " FROM prs_kostenplaats k" + " FROM prs_kostenplaats k"
+ " WHERE (UPPER(k.prs_kostenplaats_omschrijving) LIKE " + safe.quoted_sql_upper(kp+"%") + " WHERE (UPPER(k.prs_kostenplaats_omschrijving) LIKE " + safe.quoted_sql_wild(kp+"%")
+ " OR UPPER(k.prs_kostenplaats_nr) LIKE " + safe.quoted_sql_upper(kp+"%") + "))"; + " OR UPPER(k.prs_kostenplaats_nr) LIKE " + safe.quoted_sql_wild(kp+"%") + "))";
if (org_key) if (org_key)
sql += " AND " + org_key + " IN " sql += " AND " + org_key + " IN "

4
APPL/MRK/mrk_list.inc
View File

@@ -93,8 +93,8 @@ function mrk_list (pautfunction, params)
if (params.categorie_key) if (params.categorie_key)
sql += " AND d.ins_discipline_key = " + params.categorie_key; sql += " AND d.ins_discipline_key = " + params.categorie_key;
if (params.searchtekst) if (params.searchtekst)
sql += " AND (UPPER(b.mrk_bericht_titel) LIKE " + safe.quoted_sql_upper("%" + params.searchtekst + "%") sql += " AND (UPPER(b.mrk_bericht_titel) LIKE " + safe.quoted_sql_wild("%" + params.searchtekst + "%")
+ " OR UPPER(b.mrk_bericht_omschrijving) LIKE " + safe.quoted_sql_upper("%" + params.searchtekst + "%") + ")" + " OR UPPER(b.mrk_bericht_omschrijving) LIKE " + safe.quoted_sql_wild("%" + params.searchtekst + "%") + ")"
sql += " ORDER BY b.mrk_bericht_aanmaak DESC"; sql += " ORDER BY b.mrk_bericht_aanmaak DESC";

6
APPL/MSG/msg_list.inc
View File

@@ -122,7 +122,7 @@ function msg_list(pautfunction, params)
+ " WHERE fac_nieuws.prs_perslid_key = p.prs_perslid_key(+)" + " WHERE fac_nieuws.prs_perslid_key = p.prs_perslid_key(+)"
+ " AND fac_nieuws_onrgoed_key = SCOPE.thekey(+)" + " AND fac_nieuws_onrgoed_key = SCOPE.thekey(+)"
+ " AND fac_nieuws_onrgoed_niveau = SCOPE.thelevel(+)"; + " AND fac_nieuws_onrgoed_niveau = SCOPE.thelevel(+)";
if (bld_key) if (bld_key)
{ {
sqln += " AND SCOPE.thekey = " + loc_key sqln += " AND SCOPE.thekey = " + loc_key
@@ -141,8 +141,8 @@ function msg_list(pautfunction, params)
if (searchtext) if (searchtext)
{ {
sqln += " AND (UPPER(fac_nieuws_titel) LIKE " + safe.quoted_sql_upper("%" + searchtext + "%") sqln += " AND (UPPER(fac_nieuws_titel) LIKE " + safe.quoted_sql_wild("%" + searchtext + "%")
+ " OR UPPER(fac_nieuws_omschrijving) LIKE " + safe.quoted_sql_upper("%" + searchtext + "%")+")"; + " OR UPPER(fac_nieuws_omschrijving) LIKE " + safe.quoted_sql_wild("%" + searchtext + "%")+")";
} }
if (dateon) if (dateon)

2
APPL/PRJ/prj_list.inc
View File

@@ -92,7 +92,7 @@ function prj_list (pautfunction, params)
: ""); : "");
if (scenario) if (scenario)
sql += " AND UPPER (s.prj_scenario_omschrijving) LIKE " + safe.quoted_sql_upper("%" + scenario + "%"); sql += " AND UPPER (s.prj_scenario_omschrijving) LIKE " + safe.quoted_sql_wild("%" + scenario + "%");
if (loc_key) if (loc_key)
sql += " AND g.alg_locatie_key = " + loc_key; sql += " AND g.alg_locatie_key = " + loc_key;

12
APPL/PRS/bedrijf_list.inc
View File

@@ -126,18 +126,18 @@ function bedrijf_list (pautfunction, params)
} }
if (naam) if (naam)
sql+= " AND b.prs_bedrijf_naam_upper LIKE "+safe.quoted_sql_upper("%"+naam+"%"); sql+= " AND b.prs_bedrijf_naam_upper LIKE "+safe.quoted_sql_wild("%"+naam+"%");
if (contactpersoon) if (contactpersoon)
sql+= " AND UPPER(b.prs_bedrijf_contact_persoon) LIKE "+safe.quoted_sql_upper("%"+contactpersoon+"%"); sql+= " AND UPPER(b.prs_bedrijf_contact_persoon) LIKE "+safe.quoted_sql_wild("%"+contactpersoon+"%");
if (postcode) if (postcode)
sql+= " AND (UPPER(b.prs_bedrijf_bezoek_postcode) LIKE "+safe.quoted_sql_upper("%"+postcode+"%") sql+= " AND (UPPER(b.prs_bedrijf_bezoek_postcode) LIKE "+safe.quoted_sql_wild("%"+postcode+"%")
+ " OR UPPER(b.prs_bedrijf_post_postcode) LIKE "+safe.quoted_sql_upper("%"+postcode+"%") +")"; + " OR UPPER(b.prs_bedrijf_post_postcode) LIKE "+safe.quoted_sql_wild("%"+postcode+"%") +")";
if (plaats) if (plaats)
sql+= " AND (UPPER(b.prs_bedrijf_bezoek_plaats) LIKE "+safe.quoted_sql_upper("%"+plaats+"%") sql+= " AND (UPPER(b.prs_bedrijf_bezoek_plaats) LIKE "+safe.quoted_sql_wild("%"+plaats+"%")
+ " OR UPPER(b.prs_bedrijf_post_plaats) LIKE "+safe.quoted_sql_upper("%"+plaats+"%") +")"; + " OR UPPER(b.prs_bedrijf_post_plaats) LIKE "+safe.quoted_sql_wild("%"+plaats+"%") +")";
// Weet dat Of de locatiekey of de gebouwkey ingevuld is (of allebei niet) // Weet dat Of de locatiekey of de gebouwkey ingevuld is (of allebei niet)
if (locatie_key && !gebouw_key) if (locatie_key && !gebouw_key)

4
APPL/PRS/kpn_list.inc
View File

@@ -106,12 +106,12 @@ function kpn_list(pautfunction, params)
if (descr) if (descr)
{ {
sqln += " AND UPPER(k.prs_kostenplaats_omschrijving) LIKE " + safe.quoted_sql_upper("%" + descr + "%"); sqln += " AND UPPER(k.prs_kostenplaats_omschrijving) LIKE " + safe.quoted_sql_wild("%" + descr + "%");
} }
if (name) if (name)
{ {
sqln += " AND UPPER(k.prs_kostenplaats_nr) LIKE " + safe.quoted_sql_upper("%" + name + "%"); sqln += " AND UPPER(k.prs_kostenplaats_nr) LIKE " + safe.quoted_sql_wild("%" + name + "%");
} }
if (budgeth_key) if (budgeth_key)

2
APPL/PRS/kpngroep_list.inc
View File

@@ -99,7 +99,7 @@ function kpngroep_list(pautfunction, params)
if (descr) if (descr)
{ {
sqln += " AND UPPER(kpg.prs_kostenplaatsgrp_oms) LIKE " + safe.quoted_sql_upper("%" + descr + "%"); sqln += " AND UPPER(kpg.prs_kostenplaatsgrp_oms) LIKE " + safe.quoted_sql_wild("%" + descr + "%");
} }
if (budgeth_key) if (budgeth_key)

4
APPL/PRS/prs_afdeling_list.inc
View File

@@ -189,12 +189,12 @@ function afdeling_list(pautfunction, params)
if (deptName) if (deptName)
{ {
sqln += " AND UPPER(dd.prs_afdeling_naam) LIKE " + safe.quoted_sql_upper("%" + deptName + "%"); sqln += " AND UPPER(dd.prs_afdeling_naam) LIKE " + safe.quoted_sql_wild("%" + deptName + "%");
} }
if (deptDesc) if (deptDesc)
{ {
sqln += " AND UPPER(dd.prs_afdeling_omschrijving) LIKE " + safe.quoted_sql_upper("%" + deptDesc + "%"); sqln += " AND UPPER(dd.prs_afdeling_omschrijving) LIKE " + safe.quoted_sql_wild("%" + deptDesc + "%");
} }
if (kstpl_key) if (kstpl_key)

8
APPL/PRS/prs_perslid_list.inc
View File

@@ -178,13 +178,13 @@ function perslid_list(pautfunction, params)
if (prsName) if (prsName)
{ {
sqln += " AND p.prs_perslid_upper LIKE " + safe.quoted_sql_upper(prsName + "%"); sqln += " AND p.prs_perslid_upper LIKE " + safe.quoted_sql_wild(prsName + "%");
} }
if (prsLogin) if (prsLogin)
{ {
sqln += " AND (UPPER(p.prs_perslid_oslogin) LIKE " + safe.quoted_sql_upper(prsLogin + "%") sqln += " AND (UPPER(p.prs_perslid_oslogin) LIKE " + safe.quoted_sql_wild(prsLogin + "%")
+ " OR (UPPER(p.prs_perslid_oslogin2) LIKE " + safe.quoted_sql_upper(prsLogin + "%") + " OR (UPPER(p.prs_perslid_oslogin2) LIKE " + safe.quoted_sql_wild(prsLogin + "%")
+ " AND NOT EXISTS (SELECT p2.prs_perslid_oslogin " + " AND NOT EXISTS (SELECT p2.prs_perslid_oslogin "
+ " FROM prs_perslid p2 " + " FROM prs_perslid p2 "
+ " WHERE p2.prs_perslid_oslogin = p.prs_perslid_oslogin2))) "; + " WHERE p2.prs_perslid_oslogin = p.prs_perslid_oslogin2))) ";
@@ -197,7 +197,7 @@ function perslid_list(pautfunction, params)
if (prsNR) if (prsNR)
{ {
sqln += " AND UPPER(p.PRS_PERSLID_NR) LIKE " + safe.quoted_sql_upper(prsNR + "%") sqln += " AND UPPER(p.PRS_PERSLID_NR) LIKE " + safe.quoted_sql_wild(prsNR + "%")
} }
if (dept) if (dept)

12
APPL/SLE/sle_list.inc
View File

@@ -62,7 +62,7 @@ function sle_list (params)
// De functie checkAutorisation(autfunction) geeft een Response.End indien er geen autorisatie voor autfunction wordt gevonden // De functie checkAutorisation(autfunction) geeft een Response.End indien er geen autorisatie voor autfunction wordt gevonden
var authparams = user.checkAutorisation(sletype == "S"? ["WEB_SLEBOF", "WEB_SLEFOF"] : ["WEB_SLEBOF"]); var authparams = user.checkAutorisation(sletype == "S"? ["WEB_SLEBOF", "WEB_SLEFOF"] : ["WEB_SLEBOF"]);
// Na deze check heb ik in ieder geval rechten 1) sletype == "S": WEB_SLEBOF en/of WEB_SLEFOF rechten 2) sletype == "C" WEB_SLEBOF rechten. // Na deze check heb ik in ieder geval rechten 1) sletype == "S": WEB_SLEBOF en/of WEB_SLEFOF rechten 2) sletype == "C" WEB_SLEBOF rechten.
// WEB_SLEBOF: PRSread/PRSwrite: Niet van belang. // WEB_SLEBOF: PRSread/PRSwrite: Niet van belang.
// WEB_SLEBOF: ALGread: Hiermee kan ik sleutels/cilinders zien (met eventuale autorisatie op ruimte). // WEB_SLEBOF: ALGread: Hiermee kan ik sleutels/cilinders zien (met eventuale autorisatie op ruimte).
@@ -127,7 +127,7 @@ function sle_list (params)
+ " AND s.ins_srtdeel_key = d.ins_srtdeel_key" + " AND s.ins_srtdeel_key = d.ins_srtdeel_key"
+ " AND sg.ins_srtgroep_key = " + S("sle_ins_srt_groep_key") + " AND sg.ins_srtgroep_key = " + S("sle_ins_srt_groep_key")
+ (deel + (deel
? " AND d.ins_deel_upper LIKE " + safe.quoted_sql_upper("%" + deel + "%") ? " AND d.ins_deel_upper LIKE " + safe.quoted_sql_wild("%" + deel + "%")
: "") : "")
+ sqlPlaats + sqlPlaats
+ sqlFlex; + sqlFlex;
@@ -161,7 +161,7 @@ function sle_list (params)
+ " WHERE prs_perslid_key = " + user_key + " WHERE prs_perslid_key = " + user_key
+ " AND niveau = " + authparamsSLEFOF.ALGreadlevel + ")" // Er is een scope-beperking van kracht + " AND niveau = " + authparamsSLEFOF.ALGreadlevel + ")" // Er is een scope-beperking van kracht
: ""); : "");
// Uitgegeven sleutels voor uitgegeven cilinders aan terrein // Uitgegeven sleutels voor uitgegeven cilinders aan terrein
if (authparamsSLEFOF) if (authparamsSLEFOF)
sqlSleutels += " UNION " sqlSleutels += " UNION "
@@ -313,7 +313,7 @@ function sle_list (params)
+ " AND aog.alg_locatie_key = l.alg_locatie_key" + " AND aog.alg_locatie_key = l.alg_locatie_key"
+ " AND sg.ins_srtgroep_key = " + S("sle_ins_srt_groep_key") + " AND sg.ins_srtgroep_key = " + S("sle_ins_srt_groep_key")
+ (deel + (deel
? " AND d.ins_deel_upper LIKE " + safe.quoted_sql_upper("%" + deel + "%") ? " AND d.ins_deel_upper LIKE " + safe.quoted_sql_wild("%" + deel + "%")
: "") : "")
+ sqlPlaats + sqlPlaats
+ sqlFlex; + sqlFlex;
@@ -378,7 +378,7 @@ function sle_list (params)
+ " AND s.ins_srtdeel_key = d.ins_srtdeel_key(+)" + " AND s.ins_srtdeel_key = d.ins_srtdeel_key(+)"
+ " AND sg.ins_srtgroep_key IN (" + S("sle_ins_srt_groep_key") + "," + S("cil_ins_srt_groep_key") + ")" + " AND sg.ins_srtgroep_key IN (" + S("sle_ins_srt_groep_key") + "," + S("cil_ins_srt_groep_key") + ")"
+ (deel + (deel
? " AND d.ins_deel_upper LIKE " + safe.quoted_sql_upper("%" + deel + "%") ? " AND d.ins_deel_upper LIKE " + safe.quoted_sql_wild("%" + deel + "%")
: "") : "")
+ " AND s.ins_srtgroep_key = " + S("cil_ins_srt_groep_key") // Alleen cilinders kunnen aan een terrein gekoppeld zijn + " AND s.ins_srtgroep_key = " + S("cil_ins_srt_groep_key") // Alleen cilinders kunnen aan een terrein gekoppeld zijn
+ " AND d.ins_alg_ruimte_type = 'T'" + " AND d.ins_alg_ruimte_type = 'T'"
@@ -407,7 +407,7 @@ function sle_list (params)
+ " AND aog.alg_locatie_key = l.alg_locatie_key" + " AND aog.alg_locatie_key = l.alg_locatie_key"
+ " AND sg.ins_srtgroep_key = " + S("cil_ins_srt_groep_key") + " AND sg.ins_srtgroep_key = " + S("cil_ins_srt_groep_key")
+ (deel + (deel
? " AND d.ins_deel_upper LIKE " + safe.quoted_sql_upper("%" + deel + "%") ? " AND d.ins_deel_upper LIKE " + safe.quoted_sql_wild("%" + deel + "%")
: "") : "")
+ sqlPlaats + sqlPlaats
+ sqlFlex; + sqlFlex;

4
APPL/Shared/Suggest/SuggestAfdeling.asp
View File

@@ -80,8 +80,8 @@ sql = "SELECT d.prs_afdeling_key"
+ ", " + S("prs_kpn_string") + " kpl" + ", " + S("prs_kpn_string") + " kpl"
+ ", prs_afdeling_naam3 afd" + ", prs_afdeling_naam3 afd"
+ " FROM prs_v_aanwezigafdeling d, prs_v_aanwezigkostenplaats k" + " FROM prs_v_aanwezigafdeling d, prs_v_aanwezigkostenplaats k"
+ " WHERE (UPPER(" + S("prs_dep_string") + ") LIKE " + safe.quoted_sql_upper("%" + chars + "%") + " WHERE (UPPER(" + S("prs_dep_string") + ") LIKE " + safe.quoted_sql_wild("%" + chars + "%")
+ " OR UPPER(" + S("prs_kpn_string") + ") LIKE " + safe.quoted_sql_upper(chars + "%") + ")" + " OR UPPER(" + S("prs_kpn_string") + ") LIKE " + safe.quoted_sql_wild(chars + "%") + ")"
+ " AND d.prs_kostenplaats_key = k.prs_kostenplaats_key (+)" + " AND d.prs_kostenplaats_key = k.prs_kostenplaats_key (+)"
+ filtClause + filtClause
+ " ORDER BY 2" + " ORDER BY 2"

4
APPL/Shared/Suggest/SuggestArtikelgroep.asp
View File

@@ -46,8 +46,8 @@ sql = "SELECT bsg.bes_srtgroep_key"
+ ", bes_discipline bd" + ", bes_discipline bd"
+ " WHERE bsg.ins_discipline_key = bd.ins_discipline_key" + " WHERE bsg.ins_discipline_key = bd.ins_discipline_key"
+ " AND bsg.bes_srtgroep_verwijder IS NULL" + " AND bsg.bes_srtgroep_verwijder IS NULL"
+ " AND (UPPER(" + lcl.xsql('bsg.bes_srtgroep_omschrijving', 'bsg.bes_srtgroep_key') + ") LIKE " + safe.quoted_sql_upper("%" + chars + "%") + " AND (UPPER(" + lcl.xsql('bsg.bes_srtgroep_omschrijving', 'bsg.bes_srtgroep_key') + ") LIKE " + safe.quoted_sql_wild("%" + chars + "%")
+ " OR UPPER(" + lcl.xsql('bd.ins_discipline_omschrijving', 'bd.ins_discipline_key') + ") LIKE " + safe.quoted_sql_upper("%" + chars + "%") +")" + " OR UPPER(" + lcl.xsql('bd.ins_discipline_omschrijving', 'bd.ins_discipline_key') + ") LIKE " + safe.quoted_sql_wild("%" + chars + "%") +")"
+ filtClause + filtClause
+ " ORDER BY bsg.bes_srtgroep_volgnr, " + lcl.xsql('bsg.bes_srtgroep_omschrijving', 'bsg.bes_srtgroep_key'); + " ORDER BY bsg.bes_srtgroep_volgnr, " + lcl.xsql('bsg.bes_srtgroep_omschrijving', 'bsg.bes_srtgroep_key');

2
APPL/Shared/Suggest/SuggestBedrijf.asp
View File

@@ -64,7 +64,7 @@ sql = "SELECT" + (dienst > 0? " DISTINCT" : "") + " b.prs_bedrijf_key"
+ ", b.prs_bedrijf_naam_upper" + ", b.prs_bedrijf_naam_upper"
+ " FROM prs_v_aanwezigbedrijf b" + " FROM prs_v_aanwezigbedrijf b"
+ sql_dienst_from + sql_dienst_from
+ " WHERE UPPER(prs_bedrijf_naam) LIKE " + safe.quoted_sql_upper(chars + "%") + " WHERE UPPER(prs_bedrijf_naam) LIKE " + safe.quoted_sql_wild(chars + "%")
+ filtClause + filtClause
+sql_dienst_where +sql_dienst_where
+ " ORDER BY b.prs_bedrijf_naam_upper "; + " ORDER BY b.prs_bedrijf_naam_upper ";

4
APPL/Shared/Suggest/SuggestDiscipline.asp
View File

@@ -62,8 +62,8 @@ sql = "SELECT DISTINCT td.ins_discipline_key"
+ filtClause.from + filtClause.from
+ " WHERE td.ins_srtdiscipline_key = sd.ins_srtdiscipline_key(+)" // Alleen bij MLD is de ins_srtdiscipline_key (altijd) ingevuld + " WHERE td.ins_srtdiscipline_key = sd.ins_srtdiscipline_key(+)" // Alleen bij MLD is de ins_srtdiscipline_key (altijd) ingevuld
+ " AND td.ins_discipline_verwijder IS NULL" + " AND td.ins_discipline_verwijder IS NULL"
+ " AND (UPPER(sd.ins_srtdiscipline_prefix || '-' || " + lcl.xsql('td.ins_discipline_omschrijving', 'td.ins_discipline_key') +") LIKE " + safe.quoted_sql_upper("%" + chars + "%") + " AND (UPPER(sd.ins_srtdiscipline_prefix || '-' || " + lcl.xsql('td.ins_discipline_omschrijving', 'td.ins_discipline_key') +") LIKE " + safe.quoted_sql_wild("%" + chars + "%")
+ " OR UPPER(" + lcl.xsql('sd.ins_srtdiscipline_omschrijving', 'sd.ins_srtdiscipline_key') + ") LIKE " + safe.quoted_sql_upper("%" + chars + "%") +")" + " OR UPPER(" + lcl.xsql('sd.ins_srtdiscipline_omschrijving', 'sd.ins_srtdiscipline_key') + ") LIKE " + safe.quoted_sql_wild("%" + chars + "%") +")"
+ filtClause.where + filtClause.where
+ " ORDER BY discipline"; + " ORDER BY discipline";

2
APPL/Shared/Suggest/SuggestDistrict.asp
View File

@@ -51,7 +51,7 @@ sql = "SELECT d.alg_district_key"
+ " FROM alg_v_aanwezigdistrict d" + " FROM alg_v_aanwezigdistrict d"
+ ", alg_v_aanwezigregio r" + ", alg_v_aanwezigregio r"
+ " WHERE d.alg_regio_key = r.alg_regio_key" + " WHERE d.alg_regio_key = r.alg_regio_key"
+ " AND alg_district_upper LIKE " + safe.quoted_sql_upper(chars + "%") + " AND alg_district_upper LIKE " + safe.quoted_sql_wild(chars + "%")
+ filtClause + filtClause
+ " ORDER BY 2" + " ORDER BY 2"
WriteResult(sql, bAll, "naam", "alg_district_key", "alg_regio_omschrijving", "extra"); WriteResult(sql, bAll, "naam", "alg_district_key", "alg_regio_omschrijving", "extra");

10
APPL/Shared/Suggest/SuggestKostenplaats.asp
View File

@@ -69,7 +69,7 @@ sql = "SELECT k.prs_kostenplaats_key kpkey"
if (filtcode == "A" || filtcode == "C") // All accounts if (filtcode == "A" || filtcode == "C") // All accounts
{ {
sql += " WHERE UPPER(" + S("prs_kpn_string") + ") LIKE " + safe.quoted_sql_upper(chars + "%") sql += " WHERE UPPER(" + S("prs_kpn_string") + ") LIKE " + safe.quoted_sql_wild(chars + "%")
+ AAfilter + AAfilter
+ (filtcode == "C" + (filtcode == "C"
? " AND k.prs_kostenplaats_key IN (SELECT c.prs_kostenplaats_key FROM cnt_v_aanwezigcontract c)" // Alle kostenplaatsen die bij een aanwezigcontract voorkomen ? " AND k.prs_kostenplaats_key IN (SELECT c.prs_kostenplaats_key FROM cnt_v_aanwezigcontract c)" // Alle kostenplaatsen die bij een aanwezigcontract voorkomen
@@ -78,13 +78,13 @@ if (filtcode == "A" || filtcode == "C") // All accounts
} }
else if (filtcode == "B") // Waar ik kostenplaatsverantwoordelijke ben else if (filtcode == "B") // Waar ik kostenplaatsverantwoordelijke ben
{ {
sql += " WHERE UPPER(" + S("prs_kpn_string") + ") LIKE " + safe.quoted_sql_upper(chars + "%") sql += " WHERE UPPER(" + S("prs_kpn_string") + ") LIKE " + safe.quoted_sql_wild(chars + "%")
+ " AND k.prs_perslid_key = " + user_key + " AND k.prs_perslid_key = " + user_key
+ " ORDER BY UPPER(" + S("prs_kpn_string") + ")"; + " ORDER BY UPPER(" + S("prs_kpn_string") + ")";
} }
else if (filtcode == "G") // Gebouwkostenplaatsen else if (filtcode == "G") // Gebouwkostenplaatsen
{ {
sql += " WHERE UPPER(" + S("prs_kpn_string") + ") LIKE " + safe.quoted_sql_upper(chars + "%") sql += " WHERE UPPER(" + S("prs_kpn_string") + ") LIKE " + safe.quoted_sql_wild(chars + "%")
+ " AND k.prs_kostenplaats_module = 'ALG'" + " AND k.prs_kostenplaats_module = 'ALG'"
+ " ORDER BY UPPER(" + S("prs_kpn_string") + ")"; + " ORDER BY UPPER(" + S("prs_kpn_string") + ")";
} }
@@ -94,7 +94,7 @@ else // waar ik op mag boeken
// Niet persoon of plaats afhankelijk // Niet persoon of plaats afhankelijk
sql+= ", prs_perslidkostenplaats pk" sql+= ", prs_perslidkostenplaats pk"
//+ (reado?", prs_kostenplaats k":", prs_v_aanwezigkostenplaats k") //+ (reado?", prs_kostenplaats k":", prs_v_aanwezigkostenplaats k")
+ " WHERE UPPER(" + S("prs_kpn_string") + ") LIKE " + safe.quoted_sql_upper(chars + "%") + " WHERE UPPER(" + S("prs_kpn_string") + ") LIKE " + safe.quoted_sql_wild(chars + "%")
+ " AND pk.prs_kostenplaats_key = k.prs_kostenplaats_key" + " AND pk.prs_kostenplaats_key = k.prs_kostenplaats_key"
+ " AND pk.prs_perslidkostenplaats_boeken = 1 " + " AND pk.prs_perslidkostenplaats_boeken = 1 "
+ " AND pk.prs_perslid_key = " + prs_key + " AND pk.prs_perslid_key = " + prs_key
@@ -111,7 +111,7 @@ else // waar ik op mag boeken
+ ", prs_afdeling a" + ", prs_afdeling a"
+ ", prs_v_aanwezigkostenplaats k" + ", prs_v_aanwezigkostenplaats k"
//+ (reado?", prs_kostenplaats k":", prs_v_aanwezigkostenplaats k") //+ (reado?", prs_kostenplaats k":", prs_v_aanwezigkostenplaats k")
+ " WHERE UPPER(" + S("prs_kpn_string") + ") LIKE " + safe.quoted_sql_upper(chars + "%") + " WHERE UPPER(" + S("prs_kpn_string") + ") LIKE " + safe.quoted_sql_wild(chars + "%")
+ " AND p.prs_afdeling_key = a.prs_afdeling_key" + " AND p.prs_afdeling_key = a.prs_afdeling_key"
+ " AND p.prs_perslid_key = " + prs_key + " AND p.prs_perslid_key = " + prs_key
+ " AND a.prs_kostenplaats_key = k.prs_kostenplaats_key" + " AND a.prs_kostenplaats_key = k.prs_kostenplaats_key"

4
APPL/Shared/Suggest/SuggestLocatie.asp
View File

@@ -72,8 +72,8 @@ if (autlevel > -1) // Efficiente versie van FAC_V_MY_PR**S_AFDELINGEN_WRITE
+ ", alg_locatie_postcode postcode" + ", alg_locatie_postcode postcode"
+ extraInf + extraInf
+ " FROM alg_v_aanweziglocatie l" + " FROM alg_v_aanweziglocatie l"
+ " WHERE (UPPER(" + S("alg_loc_string") + ") LIKE " + safe.quoted_sql_upper(chars + "%") + " WHERE (UPPER(" + S("alg_loc_string") + ") LIKE " + safe.quoted_sql_wild(chars + "%")
+ " OR UPPER(alg_locatie_code) LIKE " + safe.quoted_sql_upper(chars + "%") + ")" + " OR UPPER(alg_locatie_code) LIKE " + safe.quoted_sql_wild(chars + "%") + ")"
+ filtClause + filtClause
+ " ORDER BY 2" + " ORDER BY 2"
WriteResult(sql, bAll, "naam", "alg_locatie_key", "code", "postcode", "extra"); WriteResult(sql, bAll, "naam", "alg_locatie_key", "code", "postcode", "extra");

12
APPL/Shared/Suggest/SuggestObject.asp
View File

@@ -59,7 +59,7 @@ sqlR = "SELECT d.ins_deel_key"
+ ", alg_ruimte alg_r" + ", alg_ruimte alg_r"
+ ", alg_verdieping alg_v" + ", alg_verdieping alg_v"
+ ", alg_gebouw alg_g" + ", alg_gebouw alg_g"
+ " WHERE ins_deel_upper LIKE " + safe.quoted_sql_upper(chars + "%") + " WHERE ins_deel_upper LIKE " + safe.quoted_sql_wild(chars + "%")
+ " AND d.ins_srtdeel_key = s.ins_srtdeel_key" + " AND d.ins_srtdeel_key = s.ins_srtdeel_key"
+ " AND alg_r.alg_ruimte_key = d.ins_alg_ruimte_key" + " AND alg_r.alg_ruimte_key = d.ins_alg_ruimte_key"
+ " AND d.ins_alg_ruimte_type = 'R'" + " AND d.ins_alg_ruimte_type = 'R'"
@@ -97,7 +97,7 @@ sqlW = "SELECT d.ins_deel_key"
+ ", alg_ruimte alg_r" + ", alg_ruimte alg_r"
+ ", alg_verdieping alg_v" + ", alg_verdieping alg_v"
+ ", alg_gebouw alg_g" + ", alg_gebouw alg_g"
+ " WHERE ins_deel_upper LIKE " + safe.quoted_sql_upper(chars + "%") + " WHERE ins_deel_upper LIKE " + safe.quoted_sql_wild(chars + "%")
+ " AND d.ins_srtdeel_key = s.ins_srtdeel_key" + " AND d.ins_srtdeel_key = s.ins_srtdeel_key"
+ " AND w.prs_werkplek_key = d.ins_alg_ruimte_key" + " AND w.prs_werkplek_key = d.ins_alg_ruimte_key"
+ " AND alg_r.alg_ruimte_key = w.prs_alg_ruimte_key" + " AND alg_r.alg_ruimte_key = w.prs_alg_ruimte_key"
@@ -134,7 +134,7 @@ sqlT = "SELECT d.ins_deel_key"
+ ", alg_locatie l" + ", alg_locatie l"
+ ", alg_district di" + ", alg_district di"
+ ", alg_terreinsector alg_t" + ", alg_terreinsector alg_t"
+ " WHERE ins_deel_upper LIKE " + safe.quoted_sql_upper(chars + "%") + " WHERE ins_deel_upper LIKE " + safe.quoted_sql_wild(chars + "%")
+ " AND d.ins_srtdeel_key = s.ins_srtdeel_key" + " AND d.ins_srtdeel_key = s.ins_srtdeel_key"
+ " AND alg_t.alg_terreinsector_key = d.ins_alg_ruimte_key" + " AND alg_t.alg_terreinsector_key = d.ins_alg_ruimte_key"
+ " AND d.ins_alg_ruimte_type = 'T'" + " AND d.ins_alg_ruimte_type = 'T'"
@@ -166,7 +166,7 @@ sqlP = "SELECT d.ins_deel_key"
+ " , ins_v_aanwezigsrtdeel s" + " , ins_v_aanwezigsrtdeel s"
+ " , prs_perslid p" + " , prs_perslid p"
+ " , prs_v_afdeling_boom boom" + " , prs_v_afdeling_boom boom"
+ " WHERE ins_deel_upper LIKE " + safe.quoted_sql_upper(chars + "%") + " WHERE ins_deel_upper LIKE " + safe.quoted_sql_wild(chars + "%")
+ " AND d.ins_srtdeel_key = s.ins_srtdeel_key" + " AND d.ins_srtdeel_key = s.ins_srtdeel_key"
+ " AND p.prs_perslid_key = d.ins_alg_ruimte_key" + " AND p.prs_perslid_key = d.ins_alg_ruimte_key"
+ " AND p.prs_afdeling_key = boom.prs_afdeling_key" + " AND p.prs_afdeling_key = boom.prs_afdeling_key"
@@ -196,7 +196,7 @@ sqlC = "SELECT d.ins_deel_key"
+ " FROM ins_v_aanwezigdeel d" + " FROM ins_v_aanwezigdeel d"
+ " , ins_v_aanwezigsrtdeel s" + " , ins_v_aanwezigsrtdeel s"
+ " , prs_contactpersoon c" + " , prs_contactpersoon c"
+ " WHERE ins_deel_upper LIKE " + safe.quoted_sql_upper(chars + "%") + " WHERE ins_deel_upper LIKE " + safe.quoted_sql_wild(chars + "%")
+ " AND d.ins_srtdeel_key = s.ins_srtdeel_key" + " AND d.ins_srtdeel_key = s.ins_srtdeel_key"
+ " AND c.prs_contactpersoon_key = d.ins_alg_ruimte_key" + " AND c.prs_contactpersoon_key = d.ins_alg_ruimte_key"
+ " AND d.ins_alg_ruimte_type = 'C'" + " AND d.ins_alg_ruimte_type = 'C'"
@@ -213,7 +213,7 @@ sqlA = "SELECT d.ins_deel_key"
+ " FROM ins_v_aanwezigdeel d" + " FROM ins_v_aanwezigdeel d"
+ " , ins_v_aanwezigsrtdeel s" + " , ins_v_aanwezigsrtdeel s"
+ " , prs_v_afdeling_boom boom" + " , prs_v_afdeling_boom boom"
+ " WHERE ins_deel_upper LIKE " + safe.quoted_sql_upper(chars + "%") + " WHERE ins_deel_upper LIKE " + safe.quoted_sql_wild(chars + "%")
+ " AND d.ins_srtdeel_key = s.ins_srtdeel_key" + " AND d.ins_srtdeel_key = s.ins_srtdeel_key"
+ " AND boom.prs_afdeling_key = d.ins_alg_ruimte_key" + " AND boom.prs_afdeling_key = d.ins_alg_ruimte_key"
+ " AND d.ins_alg_ruimte_type = 'A'" + " AND d.ins_alg_ruimte_type = 'A'"

2
APPL/Shared/Suggest/SuggestOutlet.asp
View File

@@ -41,7 +41,7 @@ sql = " SELECT id.ins_deel_key"
+ " , alg_gebouw alg_g" + " , alg_gebouw alg_g"
+ " , alg_locatie alg_l" + " , alg_locatie alg_l"
+ " WHERE id.ins_srtdeel_key = " + srtdeel_key_outlet + " WHERE id.ins_srtdeel_key = " + srtdeel_key_outlet
+ " AND id.ins_deel_upper like " + safe.quoted_sql_upper(chars + "%") + " AND id.ins_deel_upper like " + safe.quoted_sql_wild(chars + "%")
+ " AND id.ins_alg_ruimte_key = alg_r.alg_ruimte_key" + " AND id.ins_alg_ruimte_key = alg_r.alg_ruimte_key"
+ " AND id.ins_deel_verwijder IS NULL" + " AND id.ins_deel_verwijder IS NULL"
+ " AND alg_r.alg_verdieping_key = alg_v.alg_verdieping_key" + " AND alg_r.alg_verdieping_key = alg_v.alg_verdieping_key"

4
APPL/Shared/Suggest/SuggestPerslid.asp
View File

@@ -101,11 +101,11 @@ if (isNaN(parseInt(chars, 10)))
// Merk op dat we de 'upper' weglaten omdat we later BINARY_AI hebben // Merk op dat we de 'upper' weglaten omdat we later BINARY_AI hebben
if (S("prs_pers_string").substring(0, 19) != ' p.prs_perslid_naam' || chars.match(/[^A-Z]/i)) if (S("prs_pers_string").substring(0, 19) != ' p.prs_perslid_naam' || chars.match(/[^A-Z]/i))
{ // rare S("prs_pers_string") of niet alleen letters { // rare S("prs_pers_string") of niet alleen letters
var like = " (" + S("prs_pers_string") + " LIKE " + safe.quoted_sql_upper(chars + "%")+ ")" var like = " (" + S("prs_pers_string") + " LIKE " + safe.quoted_sql_wild(chars + "%")+ ")"
} }
else // uitsluitend A-Z, zoek alleen op achternaam. Is twee keer zo snel bij BINARY_AI else // uitsluitend A-Z, zoek alleen op achternaam. Is twee keer zo snel bij BINARY_AI
{ {
var like = " (prs_perslid_naam LIKE " + safe.quoted_sql_upper(chars + "%")+ ")" var like = " (prs_perslid_naam LIKE " + safe.quoted_sql_wild(chars + "%")+ ")"
} }
sql = "SELECT p.prs_perslid_key" sql = "SELECT p.prs_perslid_key"
+ ", " + S("prs_pers_string") + " naam" + ", " + S("prs_pers_string") + " naam"

2
APPL/Shared/Suggest/SuggestRapport.asp
View File

@@ -42,7 +42,7 @@ var sql = "SELECT fac_usrrap_key"
+ " OR fac_functie_key IN" + " OR fac_functie_key IN"
+ " (SELECT fac_functie_key FROM fac_v_webgebruiker" + " (SELECT fac_functie_key FROM fac_v_webgebruiker"
+ " WHERE prs_perslid_key = " + user_key + "))" + " WHERE prs_perslid_key = " + user_key + "))"
+ " AND UPPER(" + lcl.xsql("fac_usrrap_omschrijving", "fac_usrrap_key") + ") LIKE " + safe.quoted_sql_upper("%" + chars + "%") + " AND UPPER(" + lcl.xsql("fac_usrrap_omschrijving", "fac_usrrap_key") + ") LIKE " + safe.quoted_sql_wild("%" + chars + "%")
+ " ORDER BY fac_usrrap_omschrijving"; + " ORDER BY fac_usrrap_omschrijving";
WriteResult(sql, bAll, "fac_usrrap_omschrijving", "fac_usrrap_key", "fac_usrrap_view_name", "extra"); WriteResult(sql, bAll, "fac_usrrap_omschrijving", "fac_usrrap_key", "fac_usrrap_view_name", "extra");

2
APPL/Shared/Suggest/SuggestRegio.asp
View File

@@ -42,7 +42,7 @@ sql = "SELECT r.alg_regio_key"
+ ", alg_regio_omschrijving naam" + ", alg_regio_omschrijving naam"
+ ", NULL extra" + ", NULL extra"
+ " FROM alg_v_aanwezigregio r" + " FROM alg_v_aanwezigregio r"
+ " WHERE alg_regio_upper like " + safe.quoted_sql_upper(chars + "%") + " WHERE alg_regio_upper like " + safe.quoted_sql_wild(chars + "%")
+ filtClause + filtClause
+ " ORDER BY 2" + " ORDER BY 2"
WriteResult(sql, bAll, "naam", "alg_regio_key", "extra"); WriteResult(sql, bAll, "naam", "alg_regio_key", "extra");

4
APPL/Shared/Suggest/SuggestSrtdeel.asp
View File

@@ -58,8 +58,8 @@ var sql = "SELECT sd.ins_srtdeel_key"
+ " WHERE sd.ins_srtgroep_key = sg.ins_srtgroep_key" + " WHERE sd.ins_srtgroep_key = sg.ins_srtgroep_key"
+ " AND (ins_srtdeel_vervaldatum IS NULL" + " AND (ins_srtdeel_vervaldatum IS NULL"
+ " OR ins_srtdeel_vervaldatum > SYSDATE)" + " OR ins_srtdeel_vervaldatum > SYSDATE)"
+ " AND (UPPER(" + lcl.xsql('sd.ins_srtdeel_omschrijving', 'sd.ins_srtdeel_key') +") LIKE " + safe.quoted_sql_upper("%" + chars + "%") + " AND (UPPER(" + lcl.xsql('sd.ins_srtdeel_omschrijving', 'sd.ins_srtdeel_key') +") LIKE " + safe.quoted_sql_wild("%" + chars + "%")
+ " OR UPPER(" + lcl.xsql('sg.ins_srtgroep_omschrijving', 'sg.ins_srtgroep_key') + ") LIKE " + safe.quoted_sql_upper("%" + chars + "%") + ")" + " OR UPPER(" + lcl.xsql('sg.ins_srtgroep_omschrijving', 'sg.ins_srtgroep_key') + ") LIKE " + safe.quoted_sql_wild("%" + chars + "%") + ")"
+ filtClause + filtClause
+ " ORDER BY sd.ins_srtdeel_nr" + " ORDER BY sd.ins_srtdeel_nr"
+ ", UPPER(" + lcl.xsql('sd.ins_srtdeel_omschrijving', 'sd.ins_srtdeel_key') + ")"; + ", UPPER(" + lcl.xsql('sd.ins_srtdeel_omschrijving', 'sd.ins_srtdeel_key') + ")";

4
APPL/Shared/Suggest/SuggestSrtgroep.asp
View File

@@ -48,8 +48,8 @@ var sql = "SELECT sg.ins_srtgroep_key"
+ ", ins_tab_discipline td" + ", ins_tab_discipline td"
+ " WHERE td.ins_discipline_key = sg.ins_discipline_key" + " WHERE td.ins_discipline_key = sg.ins_discipline_key"
+ " AND td.ins_discipline_verwijder IS NULL" + " AND td.ins_discipline_verwijder IS NULL"
+ " AND (UPPER(" + lcl.xsql('sg.ins_srtgroep_omschrijving', 'sg.ins_srtgroep_key') +") LIKE " + safe.quoted_sql_upper("%" + chars + "%") + " AND (UPPER(" + lcl.xsql('sg.ins_srtgroep_omschrijving', 'sg.ins_srtgroep_key') +") LIKE " + safe.quoted_sql_wild("%" + chars + "%")
+ " OR UPPER(" + lcl.xsql('td.ins_discipline_omschrijving', 'td.ins_discipline_key') + ") LIKE " + safe.quoted_sql_upper("%" + chars + "%") + ")" + " OR UPPER(" + lcl.xsql('td.ins_discipline_omschrijving', 'td.ins_discipline_key') + ") LIKE " + safe.quoted_sql_wild("%" + chars + "%") + ")"
+ filtClause + filtClause
+ " ORDER BY ins_srtgroep_omschrijving ASC"; + " ORDER BY ins_srtgroep_omschrijving ASC";

6
APPL/Shared/Suggest/SuggestStdmelding.asp
View File

@@ -55,9 +55,9 @@ sql = "SELECT sm.mld_stdmelding_key"
+ " FROM mld_stdmelding sm" + " FROM mld_stdmelding sm"
+ " , mld_v_aanwezigdiscipline di" + " , mld_v_aanwezigdiscipline di"
+ " , ins_srtdiscipline sd" + " , ins_srtdiscipline sd"
+ " WHERE (UPPER(" + lcl.xsql('mld_stdmelding_omschrijving', 'sm.mld_stdmelding_key') + ") LIKE " + safe.quoted_sql_upper("%" + chars + "%") + " WHERE (UPPER(" + lcl.xsql('mld_stdmelding_omschrijving', 'sm.mld_stdmelding_key') + ") LIKE " + safe.quoted_sql_wild("%" + chars + "%")
+ " OR UPPER("+ lcl.xsql('mld_stdmelding_hint', 'sm.mld_stdmelding_key') + ") LIKE " + safe.quoted_sql_upper("%" + chars + "%") + " OR UPPER("+ lcl.xsql('mld_stdmelding_hint', 'sm.mld_stdmelding_key') + ") LIKE " + safe.quoted_sql_wild("%" + chars + "%")
+ " OR UPPER("+ lcl.xsql('ins_discipline_omschrijving', 'di.ins_discipline_key') + ") LIKE " + safe.quoted_sql_upper("%" + chars + "%") +")" + " OR UPPER("+ lcl.xsql('ins_discipline_omschrijving', 'di.ins_discipline_key') + ") LIKE " + safe.quoted_sql_wild("%" + chars + "%") +")"
+ " AND sm.mld_ins_discipline_key = di.ins_discipline_key" + " AND sm.mld_ins_discipline_key = di.ins_discipline_key"
+ " AND mld_stdmelding_verwijder is null" + " AND mld_stdmelding_verwijder is null"
+ " AND di.ins_srtdiscipline_key = sd.ins_srtdiscipline_key" + " AND di.ins_srtdiscipline_key = sd.ins_srtdiscipline_key"

10
APPL/Shared/Suggest/SuggestUitvoerende.asp
View File

@@ -191,8 +191,8 @@ else // lutype == "B"
+ ", prs_dienst d" + ", prs_dienst d"
+ " WHERE b.prs_bedrijf_key = dl.prs_bedrijf_key" + " WHERE b.prs_bedrijf_key = dl.prs_bedrijf_key"
+ " AND dl.prs_dienst_key = d.prs_dienst_key" + " AND dl.prs_dienst_key = d.prs_dienst_key"
+ " AND (UPPER(b.prs_bedrijf_naam) LIKE " + safe.quoted_sql_upper("%"+chars + "%") + " AND (UPPER(b.prs_bedrijf_naam) LIKE " + safe.quoted_sql_wild("%"+chars + "%")
+ " OR UPPER("+lcl.xsql('d.prs_dienst_omschrijving', 'd.prs_dienst_key')+") LIKE " + safe.quoted_sql_upper("%" + chars + "%")+")" + " OR UPPER("+lcl.xsql('d.prs_dienst_omschrijving', 'd.prs_dienst_key')+") LIKE " + safe.quoted_sql_wild("%" + chars + "%")+")"
+ sql_dienst; + sql_dienst;
} }
sqlG = fsql("**", sqlG0); sqlG = fsql("**", sqlG0);
@@ -211,7 +211,7 @@ else // lutype == "B"
+ " FROM " + uitvtabel + " b" + " FROM " + uitvtabel + " b"
+ " WHERE 1=1 " + " WHERE 1=1 "
+ filtClause.bedrijf + filtClause.bedrijf
+ " AND UPPER(b.prs_bedrijf_naam) LIKE " + safe.quoted_sql_upper("%" + chars + "%") + " AND UPPER(b.prs_bedrijf_naam) LIKE " + safe.quoted_sql_wild("%" + chars + "%")
+ (dienst>0 + (dienst>0
? " AND EXISTS" // ? " AND EXISTS" //
+ " (SELECT dl.prs_bedrijf_key" + " (SELECT dl.prs_bedrijf_key"
@@ -248,8 +248,8 @@ else // lutype == "B"
? " AND p.prs_afdeling_key IN (SELECT a.prs_afdeling_key FROM prs_v_afdeling a " ? " AND p.prs_afdeling_key IN (SELECT a.prs_afdeling_key FROM prs_v_afdeling a "
+ " WHERE a.prs_bedrijf_key = " + user.afdeling().prs_bedrijf_key() + " )" + " WHERE a.prs_bedrijf_key = " + user.afdeling().prs_bedrijf_key() + " )"
: "")) : ""))
+ " AND (UPPER(" + S("prs_pers_string") + ") LIKE " + safe.quoted_sql_upper(chars + "%") + " AND (UPPER(" + S("prs_pers_string") + ") LIKE " + safe.quoted_sql_wild(chars + "%")
+ " OR UPPER(" + safe.quoted_sql(L("lcl_mld_intern")) + ") LIKE " + safe.quoted_sql_upper(chars + "%")+")"; + " OR UPPER(" + safe.quoted_sql(L("lcl_mld_intern")) + ") LIKE " + safe.quoted_sql_wild(chars + "%")+")";
sqlarr = [sqlD]; sqlarr = [sqlD];
if (loc_key > 0) sqlarr.push(sqlL); if (loc_key > 0) sqlarr.push(sqlL);
if (bld_key > 0) sqlarr.push(sqlG); if (bld_key > 0) sqlarr.push(sqlG);

4
APPL/Shared/Suggest/SuggestVerdieping.asp
View File

@@ -81,8 +81,8 @@ if (autlevel > -1) // Efficiente versie van FAC_V_MY_PR**S_AFDELINGEN_WRITE
+ (gebkey > -1 ?", v.alg_verdieping_code" : ", g.alg_gebouw_code||'-'||v.alg_verdieping_code") + " code" + (gebkey > -1 ?", v.alg_verdieping_code" : ", g.alg_gebouw_code||'-'||v.alg_verdieping_code") + " code"
+ ", v.alg_verdieping_omschrijving naam" + ", v.alg_verdieping_omschrijving naam"
+ " FROM alg_v_aanwezigverdieping v, alg_gebouw g" + " FROM alg_v_aanwezigverdieping v, alg_gebouw g"
+ " WHERE (UPPER(v.alg_verdieping_code) LIKE " + safe.quoted_sql_upper(chars + "%") + " WHERE (UPPER(v.alg_verdieping_code) LIKE " + safe.quoted_sql_wild(chars + "%")
+ " OR UPPER(v.alg_verdieping_omschrijving) LIKE " + safe.quoted_sql_upper(chars + "%") + ")" + " OR UPPER(v.alg_verdieping_omschrijving) LIKE " + safe.quoted_sql_wild(chars + "%") + ")"
+ filtClause + filtClause
+ " AND g.alg_gebouw_key = v.alg_gebouw_key" + " AND g.alg_gebouw_key = v.alg_gebouw_key"
+ " ORDER BY g.alg_gebouw_code, v.alg_verdieping_volgnr"; + " ORDER BY g.alg_gebouw_code, v.alg_verdieping_volgnr";

6
APPL/Shared/Suggest/SuggestWerkplek.asp
View File

@@ -131,7 +131,7 @@ sql = " SELECT DISTINCT prs_werkplek_key"
+ " END naam" + " END naam"
+ ", prs_werkplek_volgnr" + ", prs_werkplek_volgnr"
+ " FROM prs_v_perslidwerkplek_gegevens w1" + " FROM prs_v_perslidwerkplek_gegevens w1"
+ " WHERE prs_werkplek_volgnr LIKE " + safe.quoted_sql_upper(chars + "%") + " WHERE prs_werkplek_volgnr LIKE " + safe.quoted_sql_wild(chars + "%")
+ filtClause + filtClause
+ " ORDER BY 2" + " ORDER BY 2"
@@ -164,7 +164,7 @@ if (ruikey == -1) // we weten niet in welke ruimte we zitten, dus moeten we me
+ " FROM prs_werkplek w1, prs_v_werkplek_bezetting wb, " + " FROM prs_werkplek w1, prs_v_werkplek_bezetting wb, "
+ " alg_v_aanwezigruimte r, alg_verdieping v, alg_gebouw g" + " alg_v_aanwezigruimte r, alg_verdieping v, alg_gebouw g"
+ " WHERE g.alg_gebouw_code || '-' || v.alg_verdieping_code || '-' || r.alg_ruimte_nr||'-'||" + " WHERE g.alg_gebouw_code || '-' || v.alg_verdieping_code || '-' || r.alg_ruimte_nr||'-'||"
+ " prs_werkplek_omschrijving LIKE " + safe.quoted_sql_upper(chars + "%") + " prs_werkplek_omschrijving LIKE " + safe.quoted_sql_wild(chars + "%")
+ " AND w1.prs_alg_ruimte_key = r.alg_ruimte_key" + " AND w1.prs_alg_ruimte_key = r.alg_ruimte_key"
+ " AND r.alg_verdieping_key = v.alg_verdieping_key" + " AND r.alg_verdieping_key = v.alg_verdieping_key"
+ " AND v.alg_gebouw_key = g.alg_gebouw_key" + " AND v.alg_gebouw_key = g.alg_gebouw_key"
@@ -200,7 +200,7 @@ else // we weten veel context, we zitten binnen een bekende ruimte
+ " END " + " END "
+ " code" + " code"
+ " FROM prs_werkplek w1, prs_v_werkplek_bezetting wb " + " FROM prs_werkplek w1, prs_v_werkplek_bezetting wb "
+ " WHERE prs_werkplek_volgnr LIKE " + safe.quoted_sql_upper(chars + "%") + " WHERE prs_werkplek_volgnr LIKE " + safe.quoted_sql_wild(chars + "%")
+ filtClause + filtClause
+ " AND wb.prs_werkplek_key = w1.prs_werkplek_key " + " AND wb.prs_werkplek_key = w1.prs_werkplek_key "
+ (!showvirtueel + (!showvirtueel