FSN#38018 extern melding nummer ook tonen en zoekbaar

svn path=/Website/trunk/; revision=32695
This commit is contained in:
Peter Feij
2017-02-03 16:18:50 +00:00
parent 281de42222
commit b9c53d5657
3 changed files with 5 additions and 0 deletions

View File

@@ -1260,6 +1260,7 @@ mld = {setmeldingstatus:
sqln += " AND (UPPER(mld_melding_omschrijving) LIKE " + safe.quoted_sql_wild("%" + searchtekst + "%")
+ " OR UPPER(mld_melding_onderwerp) LIKE " + safe.quoted_sql_wild("%" + searchtekst + "%")
+ " OR UPPER(mld_melding_opmerking) LIKE " + safe.quoted_sql_wild("%" + searchtekst + "%")
+ " OR UPPER(mld_melding_externnr) LIKE " + safe.quoted_sql_wild(searchtekst) // wildcards doe je zelf maar.
+ " OR EXISTS (SELECT mld_melding_key"
+ " FROM mld_kenmerkmelding km"
+ " WHERE km.mld_melding_key = m.mld_melding_key"
@@ -1608,6 +1609,7 @@ mld = {setmeldingstatus:
+ " , m.mld_melding_t_respijt.eenheid respijt_eenheid"
+ " , m.mld_meldbron_key"
+ " , m.mld_meldbron_nr"
+ " , m.mld_melding_externnr"
+ " , sd.ins_srtdiscipline_prefix"
+ " , md.ins_srtdiscipline_key"
+ " , m.mld_adres_key"
@@ -1730,6 +1732,7 @@ mld = {setmeldingstatus:
respijt_eenheid: oRs("respijt_eenheid").Value || (oRs("uitvoertijd_eenheid").Value || 'D'),
meldbron_key: oRs("mld_meldbron_key").Value,
meldbron_nr: oRs("mld_meldbron_nr").Value,
externnr: oRs("mld_melding_externnr").Value,
prefix: oRs("ins_srtdiscipline_prefix").Value, // null for no prefix
srtdisc: oRs("ins_srtdiscipline_key").Value,
deladdress: oRs("mld_adres_key").Value,

View File

@@ -990,6 +990,7 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
oRs.close();
}
ROFIELDTR("fld", L("lcl_mld_meldbron_nr"), mld_melding.meldbron_nr, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_mld_externr"), mld_melding.externnr, {suppressEmpty: true});
var params = {};
if (!frontend || !S("mld_hide_fe_tracking"))

View File

@@ -429,6 +429,7 @@ function parentButton()
oRs.close();
}
ROFIELDTR("fld", L("lcl_mld_meldbron_nr"), mld_melding.meldbron_nr, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_mld_externr"), mld_melding.externnr, {suppressEmpty: true});
var params = {};
if (!frontend || !S("mld_hide_fe_tracking"))