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

STAM#52548 default closing text

Browse Source 
svn path=/Website/trunk/; revision=37676
This commit is contained in:
Erik Groener
2018-04-17 09:40:28 +00:00
parent 33abd891f6
commit 8f4a39ab50
2 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
APPL/MLD/mld_close_confirm.asp
View File

@@ -261,6 +261,10 @@ for (var i = 2; i >= 0; i--)
<% } %> <% } %>
}); });
$(document).ready(
function() {
PasteFromSelectbox();
});
</script> </script>
</head> </head>
@@ -329,14 +333,17 @@ for (var i = 2; i >= 0; i--)
+ " AND mo.mld_statusopdr_key in (6, 7, 9)" // status=afgemeld, verwerkt en afgerond + " AND mo.mld_statusopdr_key in (6, 7, 9)" // status=afgemeld, verwerkt en afgerond
+ " AND mo.mld_opdr_opmerking IS NOT NULL"; + " AND mo.mld_opdr_opmerking IS NOT NULL";
var sql = "SELECT 1" var sql = "SELECT SUM(aantal) aantal"
+ sql_from_t + " FROM ( SELECT COUNT(*) aantal" + sql_from_t
+ (ingesloten.length == 1 + (ingesloten.length == 1
? " UNION SELECT 1" + sql_from_o ? " UNION SELECT COUNT(*)" + sql_from_o
: "" : ""
); )
+ ")";
oRs = Oracle.Execute(sql); oRs = Oracle.Execute(sql);
if (!oRs.eof) var aantal_teksten = oRs("aantal").Value;
oRs.Close();
if (aantal_teksten > 0)
{ {
sql = "SELECT mld_afmeldtekst_key" sql = "SELECT mld_afmeldtekst_key"
+ " , " + lcl.xsqla('mld_afmeldtekst_naam', 'mld_afmeldtekst_key') + " , " + lcl.xsqla('mld_afmeldtekst_naam', 'mld_afmeldtekst_key')
@@ -353,11 +360,12 @@ for (var i = 2; i >= 0; i--)
+ sql_from_o + sql_from_o
} }
sql += " ORDER BY 4,2"; sql += " ORDER BY 4,2";
FCLTselector("stdopmerk", FCLTselector("stdopmerk",
sql, sql,
{ label: L("lcl_mld_inf_std_opm"), { label: L("lcl_mld_inf_std_opm"),
initKey: -1, initKey: -1,
emptyOption: "", emptyOption: (S("mld_sel_single_stdmelding")==2 && aantal_teksten==1 ? null : ""),
extraParamValue: "afmeldtekstoms", extraParamValue: "afmeldtekstoms",
onChange: "PasteFromSelectbox()"}); onChange: "PasteFromSelectbox()"});
} }

23
APPL/MLD/mld_reject.asp
View File

@@ -245,6 +245,10 @@ for (var i = 2; i >= 0; i--)
} }
} }
$(document).ready(
function() {
PasteFromSelectbox();
});
</script> </script>
<% } %> <% } %>
</head> </head>
@@ -328,14 +332,17 @@ for (var i = 2; i >= 0; i--)
+ " AND mo.mld_statusopdr_key = 6" // status=afgemeld + " AND mo.mld_statusopdr_key = 6" // status=afgemeld
+ " AND mo.mld_opdr_opmerking IS NOT NULL"; + " AND mo.mld_opdr_opmerking IS NOT NULL";
var sql = "SELECT 1" var sql = "SELECT SUM(aantal) aantal"
+ sql_from_t + " FROM ( SELECT COUNT(*) aantal" + sql_from_t
+ (ingesloten.length == 1 + (ingesloten.length == 1
? " UNION SELECT 1" + sql_from_o ? " UNION SELECT COUNT(*)" + sql_from_o
: "" : ""
); )
+ ")";
oRs = Oracle.Execute(sql); oRs = Oracle.Execute(sql);
if (!oRs.eof) var aantal_teksten = oRs("aantal").Value;
oRs.Close();
if (aantal_teksten > 0)
{ {
sql = "SELECT mld_afmeldtekst_key" sql = "SELECT mld_afmeldtekst_key"
+ " , " + lcl.xsqla('mld_afmeldtekst_naam', 'mld_afmeldtekst_key') + " , " + lcl.xsqla('mld_afmeldtekst_naam', 'mld_afmeldtekst_key')
@@ -356,7 +363,7 @@ for (var i = 2; i >= 0; i--)
sql, sql,
{ label: L("lcl_mld_inf_std_opm"), { label: L("lcl_mld_inf_std_opm"),
initKey: -1, initKey: -1,
emptyOption: "", emptyOption: (S("mld_sel_single_stdmelding")==2 && aantal_teksten==1 ? null : ""),
extraParamValue: "afmeldtekstoms", extraParamValue: "afmeldtekstoms",
onChange: "PasteFromSelectbox()"}); onChange: "PasteFromSelectbox()"});
} }