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

AKZA#34831 Bij afmelden melding afhandeltekst van opdracht overnemen

Browse Source 
svn path=/Website/trunk/; revision=27934
This commit is contained in:
Erik Groener
2016-01-27 10:59:32 +00:00
parent cff82da95f
commit 35bbf8fa66
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
APPL/MLD/mld_close_confirm.asp
View File

@@ -218,20 +218,39 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
var _imgstr2 = '';
BLOCK_START("mldClose", txt + L("lcl_mld_finish_close") + (ingesloten.length == 1? " " + prefix + ingesloten[0]: "") + _imgstr2);
var sql_from = " FROM mld_afmeldtekst"
+ " WHERE (mld_stdmelding_key IN (" + stdmld_arr.join(",") + ") )"
+ " OR (mld_stdmelding_key IS NULL AND mld_ins_discipline_key IN (" + disc_arr.join(",") + ") )"
+ " OR (mld_stdmelding_key IS NULL AND mld_ins_discipline_key IS NULL)";
var sql_from_t = " FROM mld_afmeldtekst"
+ " WHERE (mld_stdmelding_key IN (" + stdmld_arr.join(",") + ") )"
+ " OR (mld_stdmelding_key IS NULL AND mld_ins_discipline_key IN (" + disc_arr.join(",") + ") )"
+ " OR (mld_stdmelding_key IS NULL AND mld_ins_discipline_key IS NULL)";
var sql_from_o = " FROM mld_opdr mo"
+ " WHERE mo.mld_melding_key = " + ingesloten[0]
+ " AND mo.mld_statusopdr_key = 6"; // status=afgemeld
var sql = "SELECT 1"
+ sql_from;
+ sql_from_t
+ (ingesloten.length == 1
? " UNION SELECT 1" + sql_from_o
: ""
);
oRs = Oracle.Execute(sql);
if (!oRs.eof)
{
sql = "SELECT mld_afmeldtekst_key"
+ " , " + lcl.xsqla('mld_afmeldtekst_naam', 'mld_afmeldtekst_key')
+ " , " + lcl.xsql('mld_afmeldtekst_omschrijving', 'mld_afmeldtekst_key') + " afmeldtekstoms"
+ sql_from
+ " ORDER BY 2";
+ " , 2 src"
+ sql_from_t;
if (ingesloten.length == 1)
{
sql += " UNION "
+ "SELECT mo.mld_opdr_key"
+ " ," + safe.quoted_sql(L("lcl_opdr_closeremark") + " /") +"|| mo.mld_opdr_bedrijfopdr_volgnr"
+ " , mo.mld_opdr_opmerking"
+ " , 1"
+ sql_from_o
}
sql += " ORDER BY 4,2";
FCLTselector("stdopmerk",
sql,
{ label: L("lcl_mld_inf_std_opm"),